X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=2951ccb5e9e61ce1744a3f83cd7cf37a54a0ebf5;hb=d3ffb1e08b58d32e36682e8376c26dd5585bb421;hp=e382071e68e5cb3517a782cd7f3fe69d969bde10;hpb=fa8a648dfc55b04e778c09b841b194099e1e5dfa;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index e382071e..2951ccb5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,14 +19,7 @@
 #include "events.h"
 #include "config.h"
 
-#if 0
-GC			tile_clip_gc;
-Bitmap		       *pix[NUM_BITMAPS];
-#endif
 Bitmap		       *bitmap_db_field, *bitmap_db_door;
-#if 0
-Pixmap			tile_clipmask[NUM_TILES];
-#endif
 DrawBuffer	       *fieldbuffer;
 DrawBuffer	       *drawto_field;
 
@@ -50,14 +43,15 @@ short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			ChangeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			ChangePage[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			Count[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean			Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-unsigned long		Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-unsigned long		ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean			Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			CheckCollision[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -4192,6 +4186,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".smashed_by_spring",	ACTION_SMASHED_BY_SPRING,	FALSE	},
   { ".slurped_by_spring",	ACTION_SLURPED_BY_SPRING,	FALSE	},
   { ".twinkling",		ACTION_TWINKLING,		FALSE	},
+  { ".splashing",		ACTION_SPLASHING,		FALSE	},
   { ".other",			ACTION_OTHER,			FALSE	},
 
   /* empty suffix always matches -- check as last entry in InitSoundInfo() */
@@ -4234,8 +4229,8 @@ struct TokenIntPtrInfo image_config_vars[] =
 {
   { "global.num_toons",		&global.num_toons			   },
 
-  { "menu.draw_xoffset",	&menu.draw_xoffset_default		   },
-  { "menu.draw_yoffset",	&menu.draw_yoffset_default		   },
+  { "menu.draw_xoffset",	&menu.draw_xoffset[GFX_SPECIAL_ARG_DEFAULT]},
+  { "menu.draw_yoffset",	&menu.draw_yoffset[GFX_SPECIAL_ARG_DEFAULT]},
   { "menu.draw_xoffset.MAIN",	&menu.draw_xoffset[GFX_SPECIAL_ARG_MAIN]   },
   { "menu.draw_yoffset.MAIN",	&menu.draw_yoffset[GFX_SPECIAL_ARG_MAIN]   },
   { "menu.draw_xoffset.LEVELS",	&menu.draw_xoffset[GFX_SPECIAL_ARG_LEVELS] },
@@ -4251,7 +4246,7 @@ struct TokenIntPtrInfo image_config_vars[] =
 
   { "menu.scrollbar_xoffset",	&menu.scrollbar_xoffset			   },
 
-  { "menu.list_size",		&menu.list_size_default			   },
+  { "menu.list_size",		&menu.list_size[GFX_SPECIAL_ARG_DEFAULT]   },
   { "menu.list_size.LEVELS",	&menu.list_size[GFX_SPECIAL_ARG_LEVELS]	   },
   { "menu.list_size.SCORES",	&menu.list_size[GFX_SPECIAL_ARG_SCORES]	   },
   { "menu.list_size.INFO",	&menu.list_size[GFX_SPECIAL_ARG_INFO]	   },
@@ -4359,7 +4354,7 @@ static void print_usage()
 	 "  \"print helptext.conf\"            print default helptext config\n"
 	 "  \"dump level FILE\"                dump level data from FILE\n"
 	 "  \"dump tape FILE\"                 dump tape data from FILE\n"
-	 "  \"autoplay LEVELDIR [NR]\"         play level tapes for LEVELDIR\n"
+	 "  \"autoplay LEVELDIR [NR ...]\"     play level tapes for LEVELDIR\n"
 	 "  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
 	 "\n",
 	 program.command_basename);