X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=366303b22e49d5236b65e5ebe2b04186a6cd8f8e;hp=e4be893cc2f31b6696ec76af573f6d2f6693a008;hb=9e54f3f605e0999f4f2d866107449c247493e957;hpb=449875f76f4db3321d90bdca0b7060c2e53e8ba9

diff --git a/src/tools.c b/src/tools.c
index e4be893c..366303b2 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -5738,6 +5738,53 @@ 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
+  },
+
+  {
+    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
@@ -7422,51 +7469,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
-  },
-  {
-    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
-  },
-  {
-    Zplayer,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-  {
-    Zborder,				FALSE,	FALSE,
-    EL_EMPTY,				-1, -1
-  },
-
   {
     -1,					FALSE,	FALSE,
     -1,					-1, -1
@@ -8775,13 +8777,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 :