rnd-20041018-1-src

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 436b3cdb2a4ac1f87234cb3025e4668d087acb2f..995ab57779d45d2a05fdc58cb67babd4bf8f521f 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3902,19 +3902,19 @@ mapping_EM_to_RND_list[] =
   },
   {
     Xdoor_5,                           TRUE,
-    EL_EMC_GATE_5,                     -1, -1
+    EL_EM_GATE_5,                      -1, -1
   },
   {
     Xdoor_6,                           TRUE,
-    EL_EMC_GATE_6,                     -1, -1
+    EL_EM_GATE_6,                      -1, -1
   },
   {
     Xdoor_7,                           TRUE,
-    EL_EMC_GATE_7,                     -1, -1
+    EL_EM_GATE_7,                      -1, -1
   },
   {
     Xdoor_8,                           TRUE,
-    EL_EMC_GATE_8,                     -1, -1
+    EL_EM_GATE_8,                      -1, -1
   },
   {
     Xkey_1,                            TRUE,
@@ -3934,19 +3934,19 @@ mapping_EM_to_RND_list[] =
   },
   {
     Xkey_5,                            TRUE,
-    EL_EMC_KEY_5,                      -1, -1
+    EL_EM_KEY_5,                       -1, -1
   },
   {
     Xkey_6,                            TRUE,
-    EL_EMC_KEY_6,                      -1, -1
+    EL_EM_KEY_6,                       -1, -1
   },
   {
     Xkey_7,                            TRUE,
-    EL_EMC_KEY_7,                      -1, -1
+    EL_EM_KEY_7,                       -1, -1
   },
   {
     Xkey_8,                            TRUE,
-    EL_EMC_KEY_8,                      -1, -1
+    EL_EM_KEY_8,                       -1, -1
   },
   {
     Xwind_n,                           TRUE,
@@ -4014,11 +4014,11 @@ mapping_EM_to_RND_list[] =
   },
   {
     Xbumper,                           TRUE,
-    EL_EMC_BUMPER,                     -1, -1
+    EL_EMC_SPRING_BUMPER,              -1, -1
   },
   {
     XbumperB,                          FALSE,
-    EL_EMC_BUMPER,                     -1, -1
+    EL_EMC_SPRING_BUMPER,              -1, -1
   },
   {
     Xwheel,                            TRUE,
@@ -4117,8 +4117,8 @@ mapping_EM_to_RND_list[] =
     EL_EMC_MAGNIFIER,                  -1, -1
   },
   {
-    Xdripper,                          FALSE,
-    EL_UNKNOWN,                                -1, -1
+    Xdripper,                          TRUE,
+    EL_EMC_DRIPPER,                    -1, -1
   },
   {
     XdripperB,                         FALSE,
@@ -4158,19 +4158,19 @@ mapping_EM_to_RND_list[] =
   },
   {
     Xfake_door_5,                      TRUE,
-    EL_EMC_GATE_5_GRAY,                        -1, -1
+    EL_EM_GATE_5_GRAY,                 -1, -1
   },
   {
     Xfake_door_6,                      TRUE,
-    EL_EMC_GATE_6_GRAY,                        -1, -1
+    EL_EM_GATE_6_GRAY,                 -1, -1
   },
   {
     Xfake_door_7,                      TRUE,
-    EL_EMC_GATE_7_GRAY,                        -1, -1
+    EL_EM_GATE_7_GRAY,                 -1, -1
   },
   {
     Xfake_door_8,                      TRUE,
-    EL_EMC_GATE_8_GRAY,                        -1, -1
+    EL_EM_GATE_8_GRAY,                 -1, -1
   },
   {
     Xsteel_1,                          TRUE,
@@ -4453,16 +4453,6 @@ mapping_EM_to_RND_list[] =
     EL_CHAR('©'),                      -1, -1
   },
 
-  {
-    Zplayer,                           TRUE,
-    EL_PLAYER_1,                       -1, -1
-  },
-
-  {
-    ZBORDER,                           TRUE,
-    EL_EMC_LEVEL_BORDER,               -1, -1
-  },
-
   {
     -1,                                        FALSE,
     -1,                                        -1, -1
@@ -5244,3 +5234,11 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay)
   return (GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
          GameFrameDelay);
 }
+
+unsigned int InitRND(long seed)
+{
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return InitEngineRND_EM(seed);
+  else
+    return InitEngineRND(seed);
+}