X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=03ba73b79cb3ae617a4c5987a1f93d8a2015c0bd;hb=47ed33d197cbd8d560197cb364b759a2239dff98;hp=3f8c3adf8c08ce6b85adb645b1b5dc848f98b58f;hpb=56be9668e4ff713c8fff9b105f0913dd4d373cb1;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 3f8c3adf..03ba73b7 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5738,6 +5738,61 @@ static struct Mapping_EM_to_RND_object
 }
 em_object_mapping_list[] =
 {
+  {
+    Zborder,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+  {
+    Zplayer,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+
+  {
+    Zbug,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+  {
+    Ztank,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+  {
+    Zeater,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+  {
+    Zdynamite,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+  {
+    Zboom,				FALSE,	FALSE,
+    EL_EMPTY,				-1, -1
+  },
+
+  {
+    Xchain,				FALSE,	FALSE,
+    EL_DEFAULT,				ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_bug,				FALSE,	FALSE,
+    EL_BUG,				ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_tank,				FALSE,	FALSE,
+    EL_SPACESHIP,			ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_android,			FALSE,	FALSE,
+    EL_EMC_ANDROID,			ACTION_OTHER, -1
+  },
+  {
+    Xboom_1,				FALSE,	FALSE,
+    EL_DEFAULT,				ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_2,				FALSE,	FALSE,
+    EL_DEFAULT,				ACTION_EXPLODING, -1
+  },
+
   {
     Xblank,				TRUE,	FALSE,
     EL_EMPTY,				-1, -1
@@ -7233,8 +7288,8 @@ em_object_mapping_list[] =
     EL_CHAR('!'),			-1, -1
   },
   {
-    Xalpha_quote,			TRUE,	FALSE,
-    EL_CHAR('"'),			-1, -1
+    Xalpha_apost,			TRUE,	FALSE,
+    EL_CHAR('\''),			-1, -1
   },
   {
     Xalpha_comma,			TRUE,	FALSE,
@@ -7422,43 +7477,6 @@ em_object_mapping_list[] =
     EL_SAND,				ACTION_SNAPPING, -1
   },
 
-  {
-    Xboom_bug,				FALSE,	FALSE,
-    EL_BUG,				ACTION_EXPLODING, -1
-  },
-  {
-    Xboom_bomb,				FALSE,	FALSE,
-    EL_BOMB,				ACTION_EXPLODING, -1
-  },
-  {
-    Xboom_android,			FALSE,	FALSE,
-    EL_EMC_ANDROID,			ACTION_OTHER, -1
-  },
-  {
-    Xboom_1,				FALSE,	FALSE,
-    EL_DEFAULT,				ACTION_EXPLODING, -1
-  },
-  {
-    Xboom_2,				FALSE,	FALSE,
-    EL_DEFAULT,				ACTION_EXPLODING, -1
-  },
-  {
-    Znormal,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-  {
-    Zdynamite,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-  {
-    Zplayer,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-  {
-    Zborder,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-
   {
     -1,					FALSE,	FALSE,
     -1,					-1, -1
@@ -8683,7 +8701,7 @@ void InitGraphicInfo_EM(void)
       boolean has_action_graphics = (graphic != base_graphic);
       boolean has_crumbled_graphics = (base_crumbled != base_graphic);
       struct GraphicInfo *g = &graphic_info[graphic];
-      struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
+      struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][j];
       Bitmap *src_bitmap;
       int src_x, src_y;
       // ensure to get symmetric 3-frame, 2-delay animations as used in EM
@@ -8767,13 +8785,13 @@ void InitGraphicInfo_EM(void)
 			i == Xboom_bug && j == 5 ? 2 :
 			i == Xboom_bug && j == 6 ? 2 :
 			i == Xboom_bug && j == 7 ? 0 :
-			i == Xboom_bomb && j == 1 ? 2 :
-			i == Xboom_bomb && j == 2 ? 2 :
-			i == Xboom_bomb && j == 3 ? 4 :
-			i == Xboom_bomb && j == 4 ? 4 :
-			i == Xboom_bomb && j == 5 ? 2 :
-			i == Xboom_bomb && j == 6 ? 2 :
-			i == Xboom_bomb && j == 7 ? 0 :
+			i == Xboom_tank && j == 1 ? 2 :
+			i == Xboom_tank && j == 2 ? 2 :
+			i == Xboom_tank && j == 3 ? 4 :
+			i == Xboom_tank && j == 4 ? 4 :
+			i == Xboom_tank && j == 5 ? 2 :
+			i == Xboom_tank && j == 6 ? 2 :
+			i == Xboom_tank && j == 7 ? 0 :
 			i == Xboom_android && j == 7 ? 6 :
 			i == Xboom_1 && j == 1 ? 2 :
 			i == Xboom_1 && j == 2 ? 2 :
@@ -8914,8 +8932,8 @@ void InitGraphicInfo_EM(void)
 		 Xspring);
 
 	// no separate animation for "smashed by rock" -- use rock instead
-	struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
-	struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][7 - j];
+	struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][j];
+	struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][j];
 
 	g_em->bitmap		= g_xx->bitmap;
 	g_em->src_x		= g_xx->src_x;
@@ -8951,7 +8969,7 @@ void InitGraphicInfo_EM(void)
 		       el_act_dir2img(effective_element, effective_action,
 				      direction));
 	struct GraphicInfo *g = &graphic_info[graphic];
-	struct GraphicInfo_EM *g_em = &graphic_info_em_player[p][i][7 - j];
+	struct GraphicInfo_EM *g_em = &graphic_info_em_player[p][i][j];
 	Bitmap *src_bitmap;
 	int src_x, src_y;
 	int sync_frame = j;