X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=7d2c423782d84efbfeecd893e10bef324ac29d3c;hb=ee749a764df3dfa944c1f9de740ccbeb1cfdef40;hp=ab07ad014eac393ebe18e443cb91c4ecc252e579;hpb=73dd81c85be90e466493bcc6f45c402d29bc7f20;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index ab07ad01..7d2c4237 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;
 
@@ -56,8 +49,8 @@ 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];
@@ -750,7 +743,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "letter '$'"
   },
   {
-    "char_procent",
+    "char_percent",
     "char",
     "letter '%'"
   },
@@ -1782,7 +1775,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "balloon_switch_any",
     "balloon_switch",
-    "send balloon in any direction"
+    "send balloon in pressed direction"
   },
   {
     "emc_steelwall_1",
@@ -3464,31 +3457,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "balloon_switch",
     "stop moving balloon"
   },
-  {
-    "emc_level_border",
-    "wall",
-    "level border steelwall",
-  },
-  {
-    "emc_android",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_grass",
-    "emc_grass",
-    "grass",
-  },
-  {
-    "emc_magic_ball",
-    "emc_magic_ball",
-    "magic ball",
-  },
-  {
-    "emc_magic_ball_switch",
-    "emc_magic_ball_switch",
-    "magic ball switch",
-  },
   {
     "emc_gate_5",
     "gate",
@@ -3550,9 +3518,39 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "key 8 (EMC style)",
   },
   {
-    "emc_bumper",
-    "emc_bumper",
-    "bumper",
+    "emc_android",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_grass",
+    "emc_grass",
+    "grass",
+  },
+  {
+    "emc_magic_ball",
+    "emc_magic_ball",
+    "magic ball",
+  },
+  {
+    "emc_magic_ball.active",
+    "emc_magic_ball",
+    "magic ball (activated)",
+  },
+  {
+    "emc_magic_ball_switch",
+    "emc_magic_ball_switch",
+    "magic ball switch (off)",
+  },
+  {
+    "emc_magic_ball_switch.active",
+    "emc_magic_ball_switch",
+    "magic ball switch (on)",
+  },
+  {
+    "emc_spring_bumper",
+    "emc_spring_bumper",
+    "spring bumper",
   },
   {
     "emc_plant",
@@ -3629,6 +3627,21 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "wall",
     "slippery wall"
   },
+  {
+    "emc_fake_grass",
+    "fake grass",
+    "fake grass"
+  },
+  {
+    "emc_fake_acid",
+    "fake acid",
+    "fake acid"
+  },
+  {
+    "emc_dripper",
+    "dripper",
+    "dripper"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4168,6 +4181,11 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".turning_from_right",	ACTION_TURNING_FROM_RIGHT,	FALSE	},
   { ".turning_from_up",		ACTION_TURNING_FROM_UP,		FALSE	},
   { ".turning_from_down",	ACTION_TURNING_FROM_DOWN,	FALSE	},
+  { ".smashed_by_rock",		ACTION_SMASHED_BY_ROCK,		FALSE	},
+  { ".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() */
@@ -4210,8 +4228,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] },
@@ -4227,7 +4245,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]	   },
@@ -4335,7 +4353,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);