X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=380af747136b26ab94b5d9de164e54381a4e2c27;hb=86b0ea5594dc5a9db7ac5d71fa2b7487a4fc1f9d;hp=dcd6301f1ba7c934f82e3d6ed3c51a71287f7573;hpb=6a066eac92bfa607cec653f6a97917891aee0d95;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index dcd6301f..380af747 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,8 +27,8 @@ Bitmap		       *bitmap_db_field, *bitmap_db_door;
 #if 0
 Pixmap			tile_clipmask[NUM_TILES];
 #endif
-DrawBuffer	     *fieldbuffer;
-DrawBuffer	     *drawto_field;
+DrawBuffer	       *fieldbuffer;
+DrawBuffer	       *drawto_field;
 
 int			game_status = -1;
 boolean			level_editor_test_game = FALSE;
@@ -40,14 +40,17 @@ 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];
+short			ChangeDelay[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];
+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];
@@ -84,13 +87,15 @@ 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;
 struct SetupInfo	setup;
 struct GameInfo		game;
 struct GlobalInfo	global;
+struct MenuInfo		menu;
+struct DoorInfo		door;
 struct GraphicInfo     *graphic_info = NULL;
 struct SoundInfo       *sound_info = NULL;
 
@@ -123,9 +128,9 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "normal wall"
   },
   {
-    "wall_crumbled",
+    "wall_slippery",
     "wall",
-    "round wall"
+    "slippery wall"
   },
   {
     "rock",
@@ -1216,22 +1221,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
   {
     "sp_gravity_port_right",
     "sp_port",
-    "port (leading right)"
+    "gravity port (leading right)"
   },
   {
     "sp_gravity_port_down",
     "sp_port",
-    "port (leading down)"
+    "gravity port (leading down)"
   },
   {
     "sp_gravity_port_left",
     "sp_port",
-    "port (leading left)"
+    "gravity port (leading left)"
   },
   {
     "sp_gravity_port_up",
     "sp_port",
-    "port (leading up)"
+    "gravity port (leading up)"
   },
   {
     "sp_sniksnak",
@@ -1674,9 +1679,9 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "mole (starts moving down)"
   },
   {
-    "steelwall_slanted",
+    "steelwall_slippery",
     "wall",
-    "steel wall (slanted)"
+    "slippery steel wall"
   },
   {
     "invisible_sand",
@@ -2538,6 +2543,646 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "custom",
     "custom element 128"
   },
+  {
+    "custom_129",
+    "custom",
+    "custom element 129"
+  },
+  {
+    "custom_130",
+    "custom",
+    "custom element 130"
+  },
+  {
+    "custom_131",
+    "custom",
+    "custom element 131"
+  },
+  {
+    "custom_132",
+    "custom",
+    "custom element 132"
+  },
+  {
+    "custom_133",
+    "custom",
+    "custom element 133"
+  },
+  {
+    "custom_134",
+    "custom",
+    "custom element 134"
+  },
+  {
+    "custom_135",
+    "custom",
+    "custom element 135"
+  },
+  {
+    "custom_136",
+    "custom",
+    "custom element 136"
+  },
+  {
+    "custom_137",
+    "custom",
+    "custom element 137"
+  },
+  {
+    "custom_138",
+    "custom",
+    "custom element 138"
+  },
+  {
+    "custom_139",
+    "custom",
+    "custom element 139"
+  },
+  {
+    "custom_140",
+    "custom",
+    "custom element 140"
+  },
+  {
+    "custom_141",
+    "custom",
+    "custom element 141"
+  },
+  {
+    "custom_142",
+    "custom",
+    "custom element 142"
+  },
+  {
+    "custom_143",
+    "custom",
+    "custom element 143"
+  },
+  {
+    "custom_144",
+    "custom",
+    "custom element 144"
+  },
+  {
+    "custom_145",
+    "custom",
+    "custom element 145"
+  },
+  {
+    "custom_146",
+    "custom",
+    "custom element 146"
+  },
+  {
+    "custom_147",
+    "custom",
+    "custom element 147"
+  },
+  {
+    "custom_148",
+    "custom",
+    "custom element 148"
+  },
+  {
+    "custom_149",
+    "custom",
+    "custom element 149"
+  },
+  {
+    "custom_150",
+    "custom",
+    "custom element 150"
+  },
+  {
+    "custom_151",
+    "custom",
+    "custom element 151"
+  },
+  {
+    "custom_152",
+    "custom",
+    "custom element 152"
+  },
+  {
+    "custom_153",
+    "custom",
+    "custom element 153"
+  },
+  {
+    "custom_154",
+    "custom",
+    "custom element 154"
+  },
+  {
+    "custom_155",
+    "custom",
+    "custom element 155"
+  },
+  {
+    "custom_156",
+    "custom",
+    "custom element 156"
+  },
+  {
+    "custom_157",
+    "custom",
+    "custom element 157"
+  },
+  {
+    "custom_158",
+    "custom",
+    "custom element 158"
+  },
+  {
+    "custom_159",
+    "custom",
+    "custom element 159"
+  },
+  {
+    "custom_160",
+    "custom",
+    "custom element 160"
+  },
+  {
+    "custom_161",
+    "custom",
+    "custom element 161"
+  },
+  {
+    "custom_162",
+    "custom",
+    "custom element 162"
+  },
+  {
+    "custom_163",
+    "custom",
+    "custom element 163"
+  },
+  {
+    "custom_164",
+    "custom",
+    "custom element 164"
+  },
+  {
+    "custom_165",
+    "custom",
+    "custom element 165"
+  },
+  {
+    "custom_166",
+    "custom",
+    "custom element 166"
+  },
+  {
+    "custom_167",
+    "custom",
+    "custom element 167"
+  },
+  {
+    "custom_168",
+    "custom",
+    "custom element 168"
+  },
+  {
+    "custom_169",
+    "custom",
+    "custom element 169"
+  },
+  {
+    "custom_170",
+    "custom",
+    "custom element 170"
+  },
+  {
+    "custom_171",
+    "custom",
+    "custom element 171"
+  },
+  {
+    "custom_172",
+    "custom",
+    "custom element 172"
+  },
+  {
+    "custom_173",
+    "custom",
+    "custom element 173"
+  },
+  {
+    "custom_174",
+    "custom",
+    "custom element 174"
+  },
+  {
+    "custom_175",
+    "custom",
+    "custom element 175"
+  },
+  {
+    "custom_176",
+    "custom",
+    "custom element 176"
+  },
+  {
+    "custom_177",
+    "custom",
+    "custom element 177"
+  },
+  {
+    "custom_178",
+    "custom",
+    "custom element 178"
+  },
+  {
+    "custom_179",
+    "custom",
+    "custom element 179"
+  },
+  {
+    "custom_180",
+    "custom",
+    "custom element 180"
+  },
+  {
+    "custom_181",
+    "custom",
+    "custom element 181"
+  },
+  {
+    "custom_182",
+    "custom",
+    "custom element 182"
+  },
+  {
+    "custom_183",
+    "custom",
+    "custom element 183"
+  },
+  {
+    "custom_184",
+    "custom",
+    "custom element 184"
+  },
+  {
+    "custom_185",
+    "custom",
+    "custom element 185"
+  },
+  {
+    "custom_186",
+    "custom",
+    "custom element 186"
+  },
+  {
+    "custom_187",
+    "custom",
+    "custom element 187"
+  },
+  {
+    "custom_188",
+    "custom",
+    "custom element 188"
+  },
+  {
+    "custom_189",
+    "custom",
+    "custom element 189"
+  },
+  {
+    "custom_190",
+    "custom",
+    "custom element 190"
+  },
+  {
+    "custom_191",
+    "custom",
+    "custom element 191"
+  },
+  {
+    "custom_192",
+    "custom",
+    "custom element 192"
+  },
+  {
+    "custom_193",
+    "custom",
+    "custom element 193"
+  },
+  {
+    "custom_194",
+    "custom",
+    "custom element 194"
+  },
+  {
+    "custom_195",
+    "custom",
+    "custom element 195"
+  },
+  {
+    "custom_196",
+    "custom",
+    "custom element 196"
+  },
+  {
+    "custom_197",
+    "custom",
+    "custom element 197"
+  },
+  {
+    "custom_198",
+    "custom",
+    "custom element 198"
+  },
+  {
+    "custom_199",
+    "custom",
+    "custom element 199"
+  },
+  {
+    "custom_200",
+    "custom",
+    "custom element 200"
+  },
+  {
+    "custom_201",
+    "custom",
+    "custom element 201"
+  },
+  {
+    "custom_202",
+    "custom",
+    "custom element 202"
+  },
+  {
+    "custom_203",
+    "custom",
+    "custom element 203"
+  },
+  {
+    "custom_204",
+    "custom",
+    "custom element 204"
+  },
+  {
+    "custom_205",
+    "custom",
+    "custom element 205"
+  },
+  {
+    "custom_206",
+    "custom",
+    "custom element 206"
+  },
+  {
+    "custom_207",
+    "custom",
+    "custom element 207"
+  },
+  {
+    "custom_208",
+    "custom",
+    "custom element 208"
+  },
+  {
+    "custom_209",
+    "custom",
+    "custom element 209"
+  },
+  {
+    "custom_210",
+    "custom",
+    "custom element 210"
+  },
+  {
+    "custom_211",
+    "custom",
+    "custom element 211"
+  },
+  {
+    "custom_212",
+    "custom",
+    "custom element 212"
+  },
+  {
+    "custom_213",
+    "custom",
+    "custom element 213"
+  },
+  {
+    "custom_214",
+    "custom",
+    "custom element 214"
+  },
+  {
+    "custom_215",
+    "custom",
+    "custom element 215"
+  },
+  {
+    "custom_216",
+    "custom",
+    "custom element 216"
+  },
+  {
+    "custom_217",
+    "custom",
+    "custom element 217"
+  },
+  {
+    "custom_218",
+    "custom",
+    "custom element 218"
+  },
+  {
+    "custom_219",
+    "custom",
+    "custom element 219"
+  },
+  {
+    "custom_220",
+    "custom",
+    "custom element 220"
+  },
+  {
+    "custom_221",
+    "custom",
+    "custom element 221"
+  },
+  {
+    "custom_222",
+    "custom",
+    "custom element 222"
+  },
+  {
+    "custom_223",
+    "custom",
+    "custom element 223"
+  },
+  {
+    "custom_224",
+    "custom",
+    "custom element 224"
+  },
+  {
+    "custom_225",
+    "custom",
+    "custom element 225"
+  },
+  {
+    "custom_226",
+    "custom",
+    "custom element 226"
+  },
+  {
+    "custom_227",
+    "custom",
+    "custom element 227"
+  },
+  {
+    "custom_228",
+    "custom",
+    "custom element 228"
+  },
+  {
+    "custom_229",
+    "custom",
+    "custom element 229"
+  },
+  {
+    "custom_230",
+    "custom",
+    "custom element 230"
+  },
+  {
+    "custom_231",
+    "custom",
+    "custom element 231"
+  },
+  {
+    "custom_232",
+    "custom",
+    "custom element 232"
+  },
+  {
+    "custom_233",
+    "custom",
+    "custom element 233"
+  },
+  {
+    "custom_234",
+    "custom",
+    "custom element 234"
+  },
+  {
+    "custom_235",
+    "custom",
+    "custom element 235"
+  },
+  {
+    "custom_236",
+    "custom",
+    "custom element 236"
+  },
+  {
+    "custom_237",
+    "custom",
+    "custom element 237"
+  },
+  {
+    "custom_238",
+    "custom",
+    "custom element 238"
+  },
+  {
+    "custom_239",
+    "custom",
+    "custom element 239"
+  },
+  {
+    "custom_240",
+    "custom",
+    "custom element 240"
+  },
+  {
+    "custom_241",
+    "custom",
+    "custom element 241"
+  },
+  {
+    "custom_242",
+    "custom",
+    "custom element 242"
+  },
+  {
+    "custom_243",
+    "custom",
+    "custom element 243"
+  },
+  {
+    "custom_244",
+    "custom",
+    "custom element 244"
+  },
+  {
+    "custom_245",
+    "custom",
+    "custom element 245"
+  },
+  {
+    "custom_246",
+    "custom",
+    "custom element 246"
+  },
+  {
+    "custom_247",
+    "custom",
+    "custom element 247"
+  },
+  {
+    "custom_248",
+    "custom",
+    "custom element 248"
+  },
+  {
+    "custom_249",
+    "custom",
+    "custom element 249"
+  },
+  {
+    "custom_250",
+    "custom",
+    "custom element 250"
+  },
+  {
+    "custom_251",
+    "custom",
+    "custom element 251"
+  },
+  {
+    "custom_252",
+    "custom",
+    "custom element 252"
+  },
+  {
+    "custom_253",
+    "custom",
+    "custom element 253"
+  },
+  {
+    "custom_254",
+    "custom",
+    "custom element 254"
+  },
+  {
+    "custom_255",
+    "custom",
+    "custom element 255"
+  },
+  {
+    "custom_256",
+    "custom",
+    "custom element 256"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -2793,6 +3438,11 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "diamond_breaking",
+    "-",
+    "-"
+  },
   {
     "acid_splash_left",
     "-",
@@ -2909,7 +3559,7 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-"
   },
   {
-    "sand_crumbled",
+    "dynabomb",
     "-",
     "-"
   },
@@ -2918,6 +3568,26 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "dynabomb_player_1",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_2",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_3",
+    "-",
+    "-"
+  },
+  {
+    "dynabomb_player_4",
+    "-",
+    "-"
+  },
   {
     "shield_normal_active",
     "-",
@@ -2928,6 +3598,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! */
 
@@ -2943,7 +3633,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	},
@@ -2954,6 +3644,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	},
@@ -2972,6 +3663,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	}
 };
 
@@ -2987,22 +3681,60 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
 
 struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
 {
-  { ".MAIN",		0,				},
-  { ".LEVELS",		0,				},
-  { ".SCORES",		0,				},
-  { ".EDITOR",		0,				},
-  { ".INFO",		0,				},
-  { ".SETUP",		0,				},
-  { ".DOOR",		0,				},
-  { ".PREVIEW",		0,				},
+  { ".MAIN",		GAME_MODE_MAIN,			},
+  { ".LEVELS",		GAME_MODE_LEVELS		},
+  { ".SCORES",		GAME_MODE_SCORES,		},
+  { ".EDITOR",		GAME_MODE_EDITOR,		},
+  { ".INFO",		GAME_MODE_INFO,			},
+  { ".SETUP",		GAME_MODE_SETUP,		},
+  { ".PLAYING",		GAME_MODE_PLAYING,		},
+  { ".DOOR",		GAME_MODE_PSEUDO_DOOR,		},
+  { ".PREVIEW",		GAME_MODE_PSEUDO_PREVIEW,	},
+  { ".CRUMBLED",	GAME_MODE_PSEUDO_CRUMBLED,	},
 
   { NULL,		0,				}
 };
 
+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]   },
+  { "menu.draw_yoffset.MAIN",	&menu.draw_yoffset[GFX_SPECIAL_ARG_MAIN]   },
+  { "menu.draw_xoffset.LEVELS",	&menu.draw_xoffset[GFX_SPECIAL_ARG_LEVELS] },
+  { "menu.draw_yoffset.LEVELS",	&menu.draw_yoffset[GFX_SPECIAL_ARG_LEVELS] },
+  { "menu.draw_xoffset.SCORES",	&menu.draw_xoffset[GFX_SPECIAL_ARG_SCORES] },
+  { "menu.draw_yoffset.SCORES",	&menu.draw_yoffset[GFX_SPECIAL_ARG_SCORES] },
+  { "menu.draw_xoffset.EDITOR",	&menu.draw_xoffset[GFX_SPECIAL_ARG_EDITOR] },
+  { "menu.draw_yoffset.EDITOR",	&menu.draw_yoffset[GFX_SPECIAL_ARG_EDITOR] },
+  { "menu.draw_xoffset.INFO",	&menu.draw_xoffset[GFX_SPECIAL_ARG_INFO]   },
+  { "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			   },
+
+  { NULL,			NULL,					   }
+};
+
+
 /* ------------------------------------------------------------------------- */
 /* font definitions                                                          */
 /* ------------------------------------------------------------------------- */
 
+/* Important: When one entry is a prefix of another entry, the longer entry
+   must come first, because the dynamic configuration does prefix matching! */
+
 struct FontInfo font_info[NUM_FONTS + 1] =
 {
   { "font.initial_1"		},
@@ -3013,19 +3745,26 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.title_2"		},
   { "font.menu_1"		},
   { "font.menu_2"		},
+  { "font.text_1.active"	},
+  { "font.text_2.active"	},
+  { "font.text_3.active"	},
+  { "font.text_4.active"	},
   { "font.text_1"		},
   { "font.text_2"		},
   { "font.text_3"		},
   { "font.text_4"		},
-  { "font.input"		},
-  { "font.input.active"		},
+  { "font.input_1.active"	},
+  { "font.input_2.active"	},
+  { "font.input_1"		},
+  { "font.input_2"		},
   { "font.option_off"		},
   { "font.option_on"		},
   { "font.value_1"		},
   { "font.value_2"		},
   { "font.value_old"		},
-  { "font.tape_recorder"	},
   { "font.level_number"		},
+  { "font.tape_recorder"	},
+  { "font.game_info"		},
 };
 
 
@@ -3042,7 +3781,7 @@ int main(int argc, char *argv[])
 		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
 
   InitExitFunction(CloseAllAndExit);
-  InitPlatformDependantStuff();
+  InitPlatformDependentStuff();
 
   GetOptions(argv);
   OpenAll();