X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=15c1ab4f261aefd68796c438608bb16da42c0d4e;hb=2c89261a1186ffc19bd6e5f82e9369bee1545e2f;hp=436b3cdb2a4ac1f87234cb3025e4668d087acb2f;hpb=73dd81c85be90e466493bcc6f45c402d29bc7f20;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 436b3cdb..15c1ab4f 100644
--- 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