added game over messages for Deflektor style levels in MM game 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 02eb5dfbee8825fe9f9b9b82425866ef6c3879b3..dd7edbdf16660f5115b6e2200a20e52692053080 100644 (file)
--- a/src/game_mm/mm_tools.c
+++ b/src/game_mm/mm_tools.c
@@ -1195,31 +1195,31 @@ int get_rotated_element(int element, int step)
   return base_element + (element_phase + step + num_elements) % num_elements;
 }
 
-static int map_element(int element)
+int map_wall_from_base_element(int element)
 {
   switch (element)
   {
-    case EL_WALL_STEEL:                return EL_STEEL_WALL;
-    case EL_WALL_WOOD:         return EL_WOODEN_WALL;
-    case EL_WALL_ICE:          return EL_ICE_WALL;
-    case EL_WALL_AMOEBA:       return EL_AMOEBA_WALL;
-    case EL_DF_WALL_STEEL:     return EL_DF_STEEL_WALL;
-    case EL_DF_WALL_WOOD:      return EL_DF_WOODEN_WALL;
+    case EL_WALL_STEEL_BASE:   return EL_WALL_STEEL;
+    case EL_WALL_WOOD_BASE:    return EL_WALL_WOOD;
+    case EL_WALL_ICE_BASE:     return EL_WALL_ICE;
+    case EL_WALL_AMOEBA_BASE:  return EL_WALL_AMOEBA;
+    case EL_DF_WALL_STEEL_BASE:        return EL_DF_WALL_STEEL;
+    case EL_DF_WALL_WOOD_BASE: return EL_DF_WALL_WOOD;
 
     default:                   return element;
   }
 }
 
-int unmap_element(int element)
+int map_wall_to_base_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;
+    case EL_WALL_STEEL:                return EL_WALL_STEEL_BASE;
+    case EL_WALL_WOOD:         return EL_WALL_WOOD_BASE;
+    case EL_WALL_ICE:          return EL_WALL_ICE_BASE;
+    case EL_WALL_AMOEBA:       return EL_WALL_AMOEBA_BASE;
+    case EL_DF_WALL_STEEL:     return EL_DF_WALL_STEEL_BASE;
+    case EL_DF_WALL_WOOD:      return EL_DF_WALL_WOOD_BASE;
 
     default:                   return element;
   }
@@ -1227,12 +1227,12 @@ int unmap_element(int element)
 
 int el2gfx(int element)
 {
-  return el2img_mm(map_element(element));
+  return el2img_mm(map_wall_from_base_element(element));
 }
 
 int el_act2gfx(int element, int action)
 {
-  return el_act2img_mm(map_element(element), action);
+  return el_act2img_mm(map_wall_from_base_element(element), action);
 }
 
 void RedrawPlayfield_MM(void)