diff --git a/magic/src/cartoon.c b/magic/src/cartoon.c
index 630883198..2dfee87ef 100644
--- a/magic/src/cartoon.c
+++ b/magic/src/cartoon.c
@@ -38,7 +38,7 @@
 
 /* Our globals: */
 
-static Mix_Chunk * cartoon_snd;
+static Mix_Chunk *cartoon_snd;
 
 #define OUTLINE_THRESH 48
 
@@ -46,20 +46,16 @@ static Mix_Chunk * cartoon_snd;
 int cartoon_init(magic_api * api);
 Uint32 cartoon_api_version(void);
 int cartoon_get_tool_count(magic_api * api);
-SDL_Surface * cartoon_get_icon(magic_api * api, int which);
-char * cartoon_get_name(magic_api * api, int which);
-char * cartoon_get_description(magic_api * api, int which, int mode);
-static void do_cartoon(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last,
-		       int x, int y);
+SDL_Surface *cartoon_get_icon(magic_api * api, int which);
+char *cartoon_get_name(magic_api * api, int which);
+char *cartoon_get_description(magic_api * api, int which, int mode);
+static void do_cartoon(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
 void cartoon_drag(magic_api * api, int which, SDL_Surface * canvas,
-	          SDL_Surface * last, int ox, int oy, int x, int y,
-		  SDL_Rect * update_rect);
+                  SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
 void cartoon_click(magic_api * api, int which, int mode,
-	           SDL_Surface * canvas, SDL_Surface * last,
-	           int x, int y, SDL_Rect * update_rect);
+                   SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
 void cartoon_release(magic_api * api, int which,
-		     SDL_Surface * canvas, SDL_Surface * last,
-		     int x, int y, SDL_Rect * update_rect);
+                     SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
 void cartoon_shutdown(magic_api * api);
 void cartoon_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
 int cartoon_requires_colors(magic_api * api, int which);
@@ -74,51 +70,50 @@ int cartoon_init(magic_api * api)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/sounds/magic/cartoon.wav",
-	    api->data_directory);
+  snprintf(fname, sizeof(fname), "%s/sounds/magic/cartoon.wav", api->data_directory);
   cartoon_snd = Mix_LoadWAV(fname);
 
-  return(1);
+  return (1);
 }
 
-Uint32 cartoon_api_version(void) { return(TP_MAGIC_API_VERSION); }
+Uint32 cartoon_api_version(void)
+{
+  return (TP_MAGIC_API_VERSION);
+}
 
 // We have multiple tools:
 int cartoon_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
 {
-  return(1);
+  return (1);
 }
 
 // Load our icons:
-SDL_Surface * cartoon_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
+SDL_Surface *cartoon_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/images/magic/cartoon.png",
-	   api->data_directory);
+  snprintf(fname, sizeof(fname), "%s/images/magic/cartoon.png", api->data_directory);
 
-  return(IMG_Load(fname));
+  return (IMG_Load(fname));
 }
 
 // Return our names, localized:
-char * cartoon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
+char *cartoon_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
 {
-  return(strdup(gettext_noop("Cartoon")));
+  return (strdup(gettext_noop("Cartoon")));
 }
 
 // Return our descriptions, localized:
-char * cartoon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
+char *cartoon_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
 {
-  return(strdup(gettext_noop(
-"Click and drag the mouse around to turn the picture into a cartoon.")));
+  return (strdup(gettext_noop("Click and drag the mouse around to turn the picture into a cartoon.")));
 }
 
 // Do the effect:
 
-static void do_cartoon(void * ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last,
-                int x, int y)
+static void do_cartoon(void *ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last, int x, int y)
 {
-  magic_api * api = (magic_api *) ptr;
+  magic_api *api = (magic_api *) ptr;
   int xx, yy;
   Uint8 r1, g1, b1, r2, g2, b2;
   Uint8 r, g, b;
@@ -127,86 +122,90 @@ static void do_cartoon(void * ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * can
   /* First, convert colors to more cartoony ones: */
 
   for (yy = y - 16; yy < y + 16; yy = yy + 1)
-  {
-    for (xx = x - 16; xx < x + 16; xx = xx + 1)
     {
-      if (api->in_circle(xx - x, yy - y, 16))
-      {
-        /* Get original color: */
+      for (xx = x - 16; xx < x + 16; xx = xx + 1)
+        {
+          if (api->in_circle(xx - x, yy - y, 16))
+            {
+              /* Get original color: */
 
-        SDL_GetRGB(api->getpixel(last, xx, yy), last->format, &r, &g, &b);
+              SDL_GetRGB(api->getpixel(last, xx, yy), last->format, &r, &g, &b);
 
-        api->rgbtohsv(r, g, b, &hue, &sat, &val);
+              api->rgbtohsv(r, g, b, &hue, &sat, &val);
 
-        val = val - 0.5;
-        val = val * 4;
-        val = val + 0.5;
+              val = val - 0.5;
+              val = val * 4;
+              val = val + 0.5;
 
-        if (val < 0)
-          val = 0;
-        else if (val > 1.0)
-          val = 1.0;
+              if (val < 0)
+                val = 0;
+              else if (val > 1.0)
+                val = 1.0;
 
-        val = floor(val * 4) / 4;
-        hue = floor(hue * 4) / 4;
+              val = floor(val * 4) / 4;
+              hue = floor(hue * 4) / 4;
 
-        sat = floor(sat * 4) / 4;
+              sat = floor(sat * 4) / 4;
 
-        api->hsvtorgb(hue, sat, val, &r, &g, &b);
+              api->hsvtorgb(hue, sat, val, &r, &g, &b);
 
-        api->putpixel(canvas, xx, yy, SDL_MapRGB(canvas->format, r, g, b));
-      }
+              api->putpixel(canvas, xx, yy, SDL_MapRGB(canvas->format, r, g, b));
+            }
+        }
     }
-  }
 
   /* Then, draw dark outlines where there's a large contrast change */
 
   for (yy = y - 16; yy < y + 16; yy++)
-  {
-    for (xx = x - 16; xx < x + 16; xx++)
     {
-      if (api->in_circle(xx - x, yy - y, 16))
-      {
-        /* Get original color: */
-
-        SDL_GetRGB(api->getpixel(last, xx, yy), last->format, &r, &g, &b);
-
-        SDL_GetRGB(api->getpixel(last, xx + 1, yy),
-                   last->format, &r1, &g1, &b1);
-
-        SDL_GetRGB(api->getpixel(last, xx + 1, yy + 1),
-                   last->format, &r2, &g2, &b2);
-
-        if (abs(((r + g + b) / 3) - (r1 + g1 + b1) / 3) > OUTLINE_THRESH
-            || abs(((r + g + b) / 3) - (r2 + g2 + b2) / 3) >
-            OUTLINE_THRESH || abs(r - r1) > OUTLINE_THRESH
-            || abs(g - g1) > OUTLINE_THRESH
-            || abs(b - b1) > OUTLINE_THRESH
-            || abs(r - r2) > OUTLINE_THRESH
-            || abs(g - g2) > OUTLINE_THRESH
-            || abs(b - b2) > OUTLINE_THRESH)
+      for (xx = x - 16; xx < x + 16; xx++)
         {
-          api->putpixel(canvas, xx - 1, yy,
-                   SDL_MapRGB(canvas->format, 0, 0, 0));
-          api->putpixel(canvas, xx, yy - 1,
-                   SDL_MapRGB(canvas->format, 0, 0, 0));
-          api->putpixel(canvas, xx - 1, yy - 1,
-                   SDL_MapRGB(canvas->format, 0, 0, 0));
+          if (api->in_circle(xx - x, yy - y, 16))
+            {
+              /* Get original color: */
+
+              SDL_GetRGB(api->getpixel(last, xx, yy), last->format, &r, &g, &b);
+
+              SDL_GetRGB(api->getpixel(last, xx + 1, yy), last->format, &r1, &g1, &b1);
+
+              SDL_GetRGB(api->getpixel(last, xx + 1, yy + 1), last->format, &r2, &g2, &b2);
+
+              if (abs(((r + g + b) / 3) - (r1 + g1 + b1) / 3) > OUTLINE_THRESH
+                  || abs(((r + g + b) / 3) - (r2 + g2 + b2) / 3) >
+                  OUTLINE_THRESH || abs(r - r1) > OUTLINE_THRESH
+                  || abs(g - g1) > OUTLINE_THRESH
+                  || abs(b - b1) > OUTLINE_THRESH
+                  || abs(r - r2) > OUTLINE_THRESH || abs(g - g2) > OUTLINE_THRESH || abs(b - b2) > OUTLINE_THRESH)
+                {
+                  api->putpixel(canvas, xx - 1, yy, SDL_MapRGB(canvas->format, 0, 0, 0));
+                  api->putpixel(canvas, xx, yy - 1, SDL_MapRGB(canvas->format, 0, 0, 0));
+                  api->putpixel(canvas, xx - 1, yy - 1, SDL_MapRGB(canvas->format, 0, 0, 0));
+                }
+            }
         }
-      }
     }
-  }
 }
 
 // Affect the canvas on drag:
 void cartoon_drag(magic_api * api, int which, SDL_Surface * canvas,
-	          SDL_Surface * last, int ox, int oy, int x, int y,
-		  SDL_Rect * update_rect)
+                  SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect)
 {
-  api->line((void *) api, which, canvas, last, ox, oy, x, y, 1, do_cartoon);
+  api->line((void *)api, which, canvas, last, ox, oy, x, y, 1, do_cartoon);
 
-  if (ox > x) { int tmp = ox; ox = x; x = tmp; }
-  if (oy > y) { int tmp = oy; oy = y; y = tmp; }
+  if (ox > x)
+    {
+      int tmp = ox;
+
+      ox = x;
+      x = tmp;
+    }
+  if (oy > y)
+    {
+      int tmp = oy;
+
+      oy = y;
+      y = tmp;
+    }
 
   update_rect->x = ox - 16;
   update_rect->y = oy - 16;
@@ -218,16 +217,15 @@ void cartoon_drag(magic_api * api, int which, SDL_Surface * canvas,
 
 // Affect the canvas on click:
 void cartoon_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
-	           SDL_Surface * canvas, SDL_Surface * last,
-	           int x, int y, SDL_Rect * update_rect)
+                   SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
 {
   cartoon_drag(api, which, canvas, last, x, y, x, y, update_rect);
 }
 
 // Affect the canvas on release:
 void cartoon_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
-		     SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
-		     int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
+                     SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
+                     int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
 {
 }
 
@@ -239,7 +237,8 @@ void cartoon_shutdown(magic_api * api ATTRIBUTE_UNUSED)
 }
 
 // Record the color from Tux Paint:
-void cartoon_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED)
+void cartoon_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED,
+                       Uint8 b ATTRIBUTE_UNUSED)
 {
 }
 
@@ -249,15 +248,17 @@ int cartoon_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUT
   return 0;
 }
 
-void cartoon_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
+void cartoon_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
+                      SDL_Surface * canvas ATTRIBUTE_UNUSED)
 {
 }
 
-void cartoon_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
+void cartoon_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
+                       SDL_Surface * canvas ATTRIBUTE_UNUSED)
 {
 }
 
 int cartoon_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
 {
-  return(MODE_PAINT); /* FIXME - Can also be turned into a full-image effect */
+  return (MODE_PAINT);          /* FIXME - Can also be turned into a full-image effect */
 }