switchin() and switchout() now accept mode.

magic/src/blackAndWhite.c

@@ -205,11 +205,11 @@ int blackAndWhite_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void blackAndWhite_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void blackAndWhite_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void blackAndWhite_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void blackAndWhite_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/blocks_chalk_drip.c

@@ -321,11 +321,11 @@ int blocks_chalk_drip_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int whic
   return 0;
 }
 
-void blocks_chalk_drip_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void blocks_chalk_drip_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void blocks_chalk_drip_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void blocks_chalk_drip_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/blur.c

@@ -222,11 +222,11 @@ int blur_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void blur_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void blur_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void blur_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void blur_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/blurAll.c

@@ -188,11 +188,11 @@ int blurAll_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void blurAll_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void blurAll_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void blurAll_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void blurAll_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/bricks.c

@@ -294,11 +294,11 @@ static void do_brick(magic_api * api, SDL_Surface * canvas,
   api->playsound(brick_snd, (x * 255) / canvas->w, 255);
 }
 
-void bricks_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void bricks_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void bricks_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void bricks_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/calligraphy.c

@@ -420,11 +420,11 @@ static float calligraphy_dist(float x1, float y1, float x2, float y2)
   return d;
 }
 
-void calligraphy_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void calligraphy_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void calligraphy_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void calligraphy_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/cartoon.c

@@ -223,11 +223,11 @@ int cartoon_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void cartoon_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void cartoon_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void cartoon_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void cartoon_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/confetti.c

@@ -172,14 +172,12 @@ void confetti_drag(magic_api * api, int which, SDL_Surface * canvas,
 	confetti_click(api, which, MODE_PAINT, canvas, snapshot, x, y, update_rect);
 }
 
-void confetti_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void confetti_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
-	
 }
 
-void confetti_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void confetti_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
-	
 }
 
 int confetti_modes(magic_api * api, int which)

magic/src/distortion.c

@@ -226,11 +226,11 @@ static void distortion_line_callback(void * ptr, int which,
   }
 }
 
-void distortion_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void distortion_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void distortion_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void distortion_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/emboss.c

@@ -179,11 +179,11 @@ int emboss_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void emboss_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void emboss_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void emboss_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void emboss_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/fade_darken.c

@@ -268,11 +268,11 @@ int fade_darken_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTR
   return 0;
 }
 
-void fade_darken_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void fade_darken_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void fade_darken_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void fade_darken_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/fill.c

@@ -246,11 +246,11 @@ static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y,
   }
 }
 
-void fill_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void fill_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void fill_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void fill_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/flower.c

@@ -594,11 +594,11 @@ static void flower_colorize_petals(magic_api * api)
   SDL_UnlockSurface(flower_petals);
 }
 
-void flower_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void flower_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void flower_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void flower_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/foam.c

@@ -417,11 +417,11 @@ int foam_requires_colors(magic_api * api, int which)
   return 0;  /* FIXME: Would be nice to tint the bubbles */
 }
 
-void foam_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void foam_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void foam_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void foam_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/fold.c

@@ -252,14 +252,12 @@ void fold_drag(magic_api * api, int which, SDL_Surface * canvas,
 
 }
 
-void fold_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void fold_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
-	
 }
 
-void fold_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void fold_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
-	
 }
 
 int fold_modes(magic_api * api, int which)

magic/src/glasstile.c

@@ -296,11 +296,11 @@ int glasstile_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void glasstile_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void glasstile_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void glasstile_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void glasstile_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/grass.c

@@ -244,11 +244,11 @@ static int log2int(int x)
   return y;
 }
 
-void grass_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void grass_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void grass_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void grass_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/kalidescope.c

@@ -164,11 +164,11 @@ int kalidescope_requires_colors(magic_api * api, int which)
   return 1;
 }
 
-void kalidescope_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void kalidescope_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void kalidescope_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void kalidescope_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/light.c

@@ -207,11 +207,11 @@ int light_requires_colors(magic_api * api, int which)
   return 1;
 }
 
-void light_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void light_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void light_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void light_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/metalpaint.c

@@ -173,11 +173,11 @@ int metalpaint_requires_colors(magic_api * api, int which)
   return 1;
 }
 
-void metalpaint_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void metalpaint_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void metalpaint_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void metalpaint_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/mirror_flip.c

@@ -198,11 +198,11 @@ int mirror_flip_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void mirror_flip_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void mirror_flip_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void mirror_flip_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void mirror_flip_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/negative.c

@@ -195,11 +195,11 @@ int negative_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void negative_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void negative_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void negative_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void negative_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/rainbow.c

@@ -193,11 +193,11 @@ int rainbow_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void rainbow_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void rainbow_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void rainbow_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void rainbow_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/ripples.c

@@ -177,11 +177,11 @@ int ripples_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void ripples_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void ripples_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void ripples_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void ripples_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/sharpen.c

@@ -268,11 +268,11 @@ int sharpen_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void sharpen_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void sharpen_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void sharpen_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void sharpen_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/shift.c

@@ -323,11 +323,11 @@ int shift_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
   return 0;
 }
 
-void shift_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void shift_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void shift_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void shift_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/smudge.c

@@ -172,11 +172,11 @@ int smudge_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void smudge_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void smudge_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void smudge_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void smudge_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/tint.c

@@ -204,11 +204,11 @@ int tint_requires_colors(magic_api * api, int which)
   return 1;
 }
 
-void tint_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void tint_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void tint_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void tint_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 

magic/src/waves.c

@@ -154,11 +154,11 @@ int waves_requires_colors(magic_api * api, int which)
   return 0;
 }
 
-void waves_switchin(magic_api * api, int which, SDL_Surface * canvas)
+void waves_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }
 
-void waves_switchout(magic_api * api, int which, SDL_Surface * canvas)
+void waves_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
 {
 }