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

diff --git a/src/tools.c b/src/tools.c
index 651fbb16..366303b2 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -297,7 +297,7 @@ static int getLevelFromScreenY_RND(int sy)
 
 static int getLevelFromScreenX_EM(int sx)
 {
-  int level_xsize = level.native_em_level->lev->width;
+  int level_xsize = level.native_em_level->cav->width;
   int full_xsize = level_xsize * TILESIZE_VAR;
 
   sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
@@ -314,7 +314,7 @@ static int getLevelFromScreenX_EM(int sx)
 
 static int getLevelFromScreenY_EM(int sy)
 {
-  int level_ysize = level.native_em_level->lev->height;
+  int level_ysize = level.native_em_level->cav->height;
   int full_ysize = level_ysize * TILESIZE_VAR;
 
   sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
@@ -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,43 +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
-  },
-  {
-    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
@@ -7751,11 +7761,11 @@ int map_element_EM_to_RND(int element_em)
 void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
 {
   struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
+  struct CAVE *cav = level_em->cav;
   int i, j;
 
   for (i = 0; i < TILE_MAX; i++)
-    lev->android_array[i] = Xblank;
+    cav->android_array[i] = Xblank;
 
   for (i = 0; i < level->num_android_clone_elements; i++)
   {
@@ -7764,21 +7774,21 @@ void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
 
     for (j = 0; em_object_mapping_list[j].element_em != -1; j++)
       if (em_object_mapping_list[j].element_rnd == element_rnd)
-	lev->android_array[em_object_mapping_list[j].element_em] = element_em;
+	cav->android_array[em_object_mapping_list[j].element_em] = element_em;
   }
 }
 
 void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
 {
   struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
+  struct CAVE *cav = level_em->cav;
   int i, j;
 
   level->num_android_clone_elements = 0;
 
   for (i = 0; i < TILE_MAX; i++)
   {
-    int element_em = lev->android_array[i];
+    int element_em = cav->android_array[i];
     int element_rnd;
     boolean element_found = FALSE;
 
@@ -8767,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 :