changed name of game element in EM engine

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 7822b1604bcdfee08b0ce4d96419dbd7c748eac7..3c79825e90a858482c42cac15d04342911603161 100644 (file)
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -79,7 +79,7 @@ enum
   Zdynamite,           /* internal dynamite explosion */
 
   Xboom_bug,           /* bug explosion; transition to Zbug */
-  Xboom_bomb,          /* tank/alien/bomb explosion; transition to Ztank */
+  Xboom_tank,          /* tank/alien/bomb explosion; transition to Ztank */
   Xboom_android,       /* android explosion; transition to Xboom_2 */
   Xboom_1,             /* tile explosion; transition to Xboom_2 */
   Xboom_2,             /* transition to boom[] */

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index 73b2d94c21f98318f9de4633f5de9358218d3283..ffb4d8765a381c691296566aea3396d70d83e5b9 100644 (file)
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -303,7 +303,7 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x][y-1] = Xboom_bomb;
+      cave[x][y-1] = Xboom_tank;
       break;
   }
 
@@ -328,7 +328,7 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x+1][y] = Xboom_bomb;
+      cave[x+1][y] = Xboom_tank;
       break;
   }
 
@@ -353,7 +353,7 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x][y+1] = Xboom_bomb;
+      cave[x][y+1] = Xboom_tank;
       break;
   }
 
@@ -378,7 +378,7 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_2_e:
     case Xtank_2_s:
     case Xtank_2_w:
-      cave[x-1][y] = Xboom_bomb;
+      cave[x-1][y] = Xboom_tank;
       break;
   }
 
@@ -5577,7 +5577,7 @@ static void Lpush_emerald_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5617,7 +5617,7 @@ static void Lpush_emerald_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5657,7 +5657,7 @@ static void Lpush_diamond_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5697,7 +5697,7 @@ static void Lpush_diamond_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5737,7 +5737,7 @@ static void Lpush_stone_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5777,7 +5777,7 @@ static void Lpush_stone_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5817,7 +5817,7 @@ static void Lpush_bomb_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5857,7 +5857,7 @@ static void Lpush_bomb_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5897,7 +5897,7 @@ static void Lpush_nut_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5937,7 +5937,7 @@ static void Lpush_nut_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -5977,7 +5977,7 @@ static void Lpush_spring_e(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -6017,7 +6017,7 @@ static void Lpush_spring_w(int x, int y)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xboom_1:
       return;
@@ -6816,7 +6816,7 @@ static void Lboom_one(int x, int y, boolean by_dynamite)
     case Zeater:
     case Zdynamite:
     case Xboom_bug:
-    case Xboom_bomb:
+    case Xboom_tank:
     case Xboom_android:
     case Xacid_1:
     case Xacid_2:
@@ -6882,7 +6882,7 @@ static void Lboom_one(int x, int y, boolean by_dynamite)
     case Xbomb:
     case Xbomb_pause:
     case Xbomb_fall:
-      cave[x][y] = Xboom_bomb;
+      cave[x][y] = Xboom_tank;
       return;
 
     default:
@@ -7112,7 +7112,7 @@ static void handle_tile(int x, int y)
     case Xpause:               Lpause(x, y);                   break;
 
     case Xboom_bug:            Lboom_bug(x, y, Xboom_bug);     break;
-    case Xboom_bomb:           Lboom_tank(x, y, Xboom_bomb);   break;
+    case Xboom_tank:           Lboom_tank(x, y, Xboom_tank);   break;
     case Xboom_android:                Lboom_android(x, y);            break;
     case Xboom_1:              Lboom_1(x, y);                  break;
     case Xboom_2:              Lboom_2(x, y);                  break;

diff --git a/src/tools.c b/src/tools.c
index e4be893cc2f31b6696ec76af573f6d2f6693a008..366303b22e49d5236b65e5ebe2b04186a6cd8f8e 100644 (file)
--- 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 :