renamed functions

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 4b221d0adc0b1b78b5b14076f94094a0851df511..486395cda52f5fcf99f7fd69deb5d721196fb930 100644 (file)
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -3474,12 +3474,12 @@ static void GameActions_MM_Ext(void)
       game_mm.ball_choice_pos++;
 
       int new_element = native_mm_level.ball_content[element_pos];
-      int new_element_unmapped = unmap_element(new_element);
+      int new_element_base = map_wall_to_base_element(new_element);
 
-      if (IS_WALL(new_element_unmapped))
+      if (IS_WALL(new_element_base))
       {
        // always use completely filled wall element
-       new_element = new_element_unmapped | 0x000f;
+       new_element = new_element_base | 0x000f;
       }
       else if (native_mm_level.rotate_ball_content &&
               get_num_elements(new_element) > 1)

diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c
index 95e8e21af83fe406692332ff109d72be60d97916..dd7edbdf16660f5115b6e2200a20e52692053080 100644 (file)
--- a/src/game_mm/mm_tools.c
+++ b/src/game_mm/mm_tools.c
@@ -1195,7 +1195,7 @@ 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)
   {
@@ -1210,7 +1210,7 @@ static int map_element(int element)
   }
 }
 
-int unmap_element(int element)
+int map_wall_to_base_element(int element)
 {
   switch (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)

diff --git a/src/game_mm/mm_tools.h b/src/game_mm/mm_tools.h
index c8b1d8b83c7b828ee4a12caefd1f8a5db7ae900a..f226f420ed88656e4a54695af543d2338f0d6f13 100644 (file)
--- a/src/game_mm/mm_tools.h
+++ b/src/game_mm/mm_tools.h
@@ -105,7 +105,8 @@ int get_element_phase(int);
 int get_num_elements(int);
 int get_rotated_element(int, int);
 
-int unmap_element(int);
+int map_wall_from_base_element(int);
+int map_wall_to_base_element(int);
 
 int el2gfx(int);
 int el_act2gfx(int, int);