X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=3095a5a25a8e41e7b03a17935a1ad286b59fa24e;hb=4386c0ac1665619412148f1eb907f6d366a70d7d;hp=a14350b87fb03f74277de266bf232ace78222a32;hpb=1903a68d7b7917ed45655391ecf5aaf995124eff;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index a14350b8..3095a5a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,6 @@ boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int			redraw_x1 = 0, redraw_y1 = 0;
 
 short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short			Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -50,6 +49,8 @@ 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];
+boolean			Changing[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaCnt[MAX_NUM_AMOEBA];
@@ -86,7 +87,7 @@ int			TimeFrames, TimePlayed, TimeLeft;
 
 boolean			network_player_action_received = FALSE;
 
-struct LevelInfo	level;
+struct LevelInfo	level, level_template;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct TapeInfo		tape;
@@ -2798,12 +2799,12 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-"
   },
   {
-    "nut_breaking",
+    "diamond_breaking",
     "-",
     "-"
   },
   {
-    "diamond_breaking",
+    "acid_splash_left",
     "-",
     "-"
   },
@@ -2922,11 +2923,36 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "dynabomb",
+    "-",
+    "-"
+  },
   {
     "dynabomb_active",
     "-",
     "-"
   },
+  {
+    "dynabomb_player_1",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_2",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_3",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_4",
+    "-",
+    "-"
+  },
   {
     "shield_normal_active",
     "-",
@@ -2937,6 +2963,26 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "[default]",
+    "default",
+    "-"
+  },
+  {
+    "[bd_default]",
+    "bd_default",
+    "-"
+  },
+  {
+    "[sp_default]",
+    "sp_default",
+    "-"
+  },
+  {
+    "[sb_default]",
+    "sb_default",
+    "-"
+  },
 
   /* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
 
@@ -2952,7 +2998,7 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
 /* element action and direction definitions                                  */
 /* ------------------------------------------------------------------------- */
 
-struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
+struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
 {
   { ".[DEFAULT]",	ACTION_DEFAULT,		TRUE	},
   { ".waiting",		ACTION_WAITING,		TRUE	},
@@ -2963,6 +3009,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
   { ".collecting",	ACTION_COLLECTING,	FALSE	},
   { ".dropping",	ACTION_DROPPING,	FALSE	},
   { ".pushing",		ACTION_PUSHING,		FALSE	},
+  { ".walking",		ACTION_WALKING,		FALSE	},
   { ".passing",		ACTION_PASSING,		FALSE	},
   { ".impact",		ACTION_IMPACT,		FALSE	},
   { ".breaking",	ACTION_BREAKING,	FALSE	},
@@ -2981,6 +3028,9 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
   { ".dying",		ACTION_DYING,		FALSE	},
   { ".other",		ACTION_OTHER,		FALSE	},
 
+  /* empty suffix always matches -- check as last entry in InitSoundInfo() */
+  { "",			ACTION_DEFAULT,		TRUE	},
+
   { NULL,		0,			0	}
 };
 
@@ -3004,6 +3054,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
   { ".SETUP",		GAME_MODE_SETUP,		},
   { ".DOOR",		GAME_MODE_PSEUDO_DOOR,		},
   { ".PREVIEW",		GAME_MODE_PSEUDO_PREVIEW,	},
+  { ".CRUMBLED",	GAME_MODE_PSEUDO_CRUMBLED,	},
 
   { NULL,		0,				}
 };
@@ -3011,6 +3062,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
 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.MAIN",	&menu.draw_xoffset[GFX_SPECIAL_ARG_MAIN]   },
@@ -3025,6 +3077,14 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "menu.draw_yoffset.INFO",	&menu.draw_yoffset[GFX_SPECIAL_ARG_INFO]   },
   { "menu.draw_xoffset.SETUP",	&menu.draw_xoffset[GFX_SPECIAL_ARG_SETUP]  },
   { "menu.draw_yoffset.SETUP",	&menu.draw_yoffset[GFX_SPECIAL_ARG_SETUP]  },
+
+  { "menu.scrollbar_xoffset",	&menu.scrollbar_xoffset			   },
+
+  { "menu.list_size",		&menu.list_size_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]	   },
+
   { "door.step_offset",		&door.step_offset			   },
   { "door.step_delay",		&door.step_delay			   },
 
@@ -3085,7 +3145,7 @@ int main(int argc, char *argv[])
 		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
 
   InitExitFunction(CloseAllAndExit);
-  InitPlatformDependantStuff();
+  InitPlatformDependentStuff();
 
   GetOptions(argv);
   OpenAll();