X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=94287fa08d729657518c51830e3837d0d2b11073;hb=a16126b0981ba82ddcd5f7b0f763bc4ce6aa9bdc;hp=181415d49b2168b94f86c4f09b94dda11b8420d4;hpb=d4665f01d15ba3679f378819710a84d6c2348a9c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 181415d4..94287fa0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
 unsigned long	Elementeigenschaften1[MAX_ELEMENTS];
 unsigned long	Elementeigenschaften2[MAX_ELEMENTS];
 
-int		level_nr, leveldir_nr, num_leveldirs;
+int		level_nr;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
 int		FX = SX, FY = SY, ScrollStepSize;
@@ -102,7 +102,7 @@ int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
 
 boolean		network_player_action_received = FALSE;
 
-struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
+struct LevelDirInfo    *leveldir_first = NULL, *leveldir_current = NULL;
 struct LevelInfo	level;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
@@ -110,8 +110,6 @@ struct SoundInfo	Sound[NUM_SOUNDS];
 struct TapeInfo		tape;
 struct OptionInfo	options;
 struct SetupInfo	setup;
-struct SetupFileList	*setup_list = NULL;
-struct SetupFileList	*level_setup_list = NULL;
 struct GameInfo		game;
 struct GlobalInfo	global;
 
@@ -260,7 +258,7 @@ char *element_info[] =
   "dark yam yam",				/* 60 */
   "magic wall (BD style)",
   "invisible steel wall",
-  "dynabomb",
+  "-",
   "increases number of bombs",
   "increases explosion size",
   "increases power of explosion",
@@ -302,8 +300,8 @@ char *element_info[] =
   "unknown",
   "unknown",
   "unknown",
-  "unknown",
-  "unknown",
+  "normal wall (BD style)",
+  "rock (BD style)",
   "open exit",
   "unknown",
   "amoeba",
@@ -397,8 +395,8 @@ char *element_info[] =
   "letter ''",
   "letter ''",
   "letter ''",
-  "growing wall (horizontally)",		/* 200 */
-  "growing wall (vertically)",
+  "growing wall (horizontal)",			/* 200 */
+  "growing wall (vertical)",
   "growing wall (all directions)",
   "unused",
   "unused",
@@ -428,8 +426,8 @@ char *element_info[] =
   "yellow disk",
   "terminal",
   "red disk",					/* 230 */
-  "port (vertically)",
-  "port (horizontally)",
+  "port (vertical)",
+  "port (horizontal)",
   "port (all directions)",
   "electron",
   "buggy base",
@@ -463,14 +461,14 @@ char *element_info[] =
   "white door",					/* 260 */
   "gray door (opened by white key)",
   "white key",
-  "force field",
+  "shield (passive)",
   "extra time",
   "switch gate (open)",
   "switch gate (closed)",
-  "switch for switch gate (open)",
-  "switch for switch gate (closed)",
-  "time gate",
-  "time gate with magic wheel",			/* 270 */
+  "switch for switch gate",
+  "switch for switch gate",
+  "-",
+  "-",						/* 270 */
   "red conveyor belt (left)",
   "red conveyor belt (middle)",
   "red conveyor belt (right)",
@@ -497,10 +495,11 @@ char *element_info[] =
   "switch for blue conveyor belt (right)",
   "land mine",
   "mail envelope",
-  "light switch",
+  "light switch (off)",
+  "light switch (on)",
   "sign (exclamation)",
-  "sign (radio activity)",
-  "sign (stop)",				/* 300 */
+  "sign (radio activity)",			/* 300 */
+  "sign (stop)",
   "sign (wheel chair)",
   "sign (parking)",
   "sign (one way)",
@@ -509,22 +508,54 @@ char *element_info[] =
   "sign (round)",
   "sign (exit)",
   "sign (yin yang)",
-  "sign (other)",
-  "mole (starts moving left)",			/* 310 */
+  "sign (other)",				/* 310 */
+  "mole (starts moving left)",
   "mole (starts moving right)",
   "mole (starts moving up)",
   "mole (starts moving down)",
-  "steel (?)",
+  "steel wall (slanted)",
   "invisible sand",
-  "-",
-  "-",
-  "-",
+  "dx unknown 15",
+  "dx unknown 42",
   "-",
   "-",						/* 320 */
-  "-",
-  "-",
-  "-",
-  "-",
+  "shield (active, kills enemies)",
+  "time gate (open)",
+  "time gate (closed)",
+  "switch for time gate",
+  "switch for time gate",
+  "balloon",
+  "send balloon to the left",
+  "send balloon to the right",
+  "send balloon up",
+  "send balloon down",				/* 330 */
+  "send balloon in any direction",
+  "steel wall",
+  "steel wall",
+  "steel wall",
+  "steel wall",
+  "normal wall",
+  "normal wall",
+  "normal wall",
+  "normal wall",
+  "normal wall",				/* 340 */
+  "normal wall",
+  "normal wall",
+  "normal wall",
+  "tube (all directions)",
+  "tube (vertical)",
+  "tube (horizontal)",
+  "tube (vertical & left)",
+  "tube (vertical & right)",
+  "tube (horizontal & up)",
+  "tube (horizontal & down)",			/* 350 */
+  "tube (left & up)",
+  "tube (left & down)",
+  "tube (right & up)",
+  "tube (right & down)",
+  "spring",
+  "trap",
+  "stable bomb (DX style)",
   "-"
 
   /*