rnd-19990929-2-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index daa3408176e44c6f698425e2e89b8f6288f583dc..cbaaab661d7408b49c2b43bf9fcabca45b563ce7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -110,8 +110,6 @@ struct SoundInfo    Sound[NUM_SOUNDS];
 struct TapeInfo                tape;
 struct OptionInfo      options;
 struct SetupInfo       setup;
 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;
 
 struct GameInfo                game;
 struct GlobalInfo      global;
 


@@ -463,14 +461,14 @@ char *element_info[] =
   "white door",                                        /* 260 */
   "gray door (opened by white key)",
   "white key",
   "white door",                                        /* 260 */
   "gray door (opened by white key)",
   "white key",

-  "force field (passive)",
+  "shield (passive)",

   "extra time",
   "switch gate (open)",
   "switch gate (closed)",
   "switch for switch gate",
   "switch for switch gate",
   "extra time",
   "switch gate (open)",
   "switch gate (closed)",
   "switch for switch gate",
   "switch for switch gate",

-  "time gate",
-  "time gate with magic wheel",                        /* 270 */
+  "-",
+  "-",                                         /* 270 */

   "red conveyor belt (left)",
   "red conveyor belt (middle)",
   "red conveyor belt (right)",
   "red conveyor belt (left)",
   "red conveyor belt (middle)",
   "red conveyor belt (right)",


@@ -519,14 +517,31 @@ char *element_info[] =
   "invisible sand",
   "dx unknown 15",
   "dx unknown 42",
   "invisible sand",
   "dx unknown 15",
   "dx unknown 42",

-  "dx unknown 229",
-  "dx unknown 233",                            /* 320 */
-  "force field (active, kills enemies)",
-  "-",
-  "-",
-  "-",
-  "-",

   "-",
   "-",

+  "-",                                         /* 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",

   "-"
 
   /*
   "-"
 
   /*