renamed preprocessor constant for game element in MM engine

[rocksndiamonds.git] / src / game_mm / mm_tools.c

diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c
index a8edba4e2e152d6b0b397d70f9f4bc8c2c4169c0..59c59d25737982bc64883d8abb1a763626b8d693 100644 (file)
--- a/src/game_mm/mm_tools.c
+++ b/src/game_mm/mm_tools.c
@@ -524,8 +524,14 @@ void DrawElement_MM(int x, int y, int element)
           laser.fuse_x == x &&
           laser.fuse_y == y)
     DrawGraphic_MM(x, y, IMG_MM_FUSE);
+  else if (element == EL_GRAY_BALL_ACTIVE)
+    DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_ACTIVE));
   else if (element == EL_GRAY_BALL_OPENING)
-    DrawGraphic_MM(x, y, el_act2gfx(EL_BALL_GRAY, MM_ACTION_OPENING));
+    DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_OPENING));
+  else if (element == EL_BOMB_ACTIVE)
+    DrawGraphic_MM(x, y, el_act2gfx(EL_BOMB, MM_ACTION_ACTIVE));
+  else if (element == EL_MINE_ACTIVE)
+    DrawGraphic_MM(x, y, el_act2gfx(EL_MINE, MM_ACTION_ACTIVE));
   else
     DrawGraphic_MM(x, y, el2gfx(element));
 }
@@ -1289,6 +1295,21 @@ static int map_element(int element)
   }
 }
 
+int unmap_element(int element)
+{
+  switch (element)
+  {
+    case EL_STEEL_WALL:                return EL_WALL_STEEL;
+    case EL_WOODEN_WALL:       return EL_WALL_WOOD;
+    case EL_ICE_WALL:          return EL_WALL_ICE;
+    case EL_AMOEBA_WALL:       return EL_WALL_AMOEBA;
+    case EL_DF_STEEL_WALL:     return EL_DF_WALL_STEEL;
+    case EL_DF_WOODEN_WALL:    return EL_DF_WALL_WOOD;
+
+    default:                   return element;
+  }
+}
+
 int el2gfx(int element)
 {
   return el2img_mm(map_element(element));