renamed preprocessor constant for game element in MM engine

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 2713e32092363f71e80cc2db49f09fb78f627433..9629e20cd620b32b4704a33fec529397c11836c6 100644 (file)
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -960,9 +960,9 @@ static void DeactivateLaserTargetElement(void)
 
     if (Tile[x][y] == element)
       Tile[x][y] = (element == EL_BOMB_ACTIVE ? EL_BOMB :
-                   element == EL_MINE_ACTIVE ? EL_MINE : EL_BALL_GRAY);
+                   element == EL_MINE_ACTIVE ? EL_MINE : EL_GRAY_BALL);
 
-    if (Tile[x][y] == EL_BALL_GRAY)
+    if (Tile[x][y] == EL_GRAY_BALL)
       MovDelay[x][y] = 0;
 
     laser.dest_element_last = EL_EMPTY;
@@ -1669,7 +1669,7 @@ boolean HitElement(int element, int hit_mask)
     return TRUE;
   }
 
-  if (element == EL_BOMB || element == EL_MINE || element == EL_BALL_GRAY)
+  if (element == EL_BOMB || element == EL_MINE || element == EL_GRAY_BALL)
   {
     PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING);
 
@@ -2491,7 +2491,7 @@ static void OpenSurpriseBall(int x, int y)
       BlitBitmap(drawto, bitmap_db_field, cSX + x * TILEX, cSY + y * TILEY,
                 TILEX, TILEY, x * TILEX, y * TILEY);
 
-      DrawElement_MM(x, y, EL_BALL_GRAY);
+      DrawElement_MM(x, y, EL_GRAY_BALL);
     }
 
     MovDelay[x][y] = 50 * delay;
@@ -3406,7 +3406,7 @@ static void GameActions_MM_Ext(void)
       element != EL_BOMB_ACTIVE &&
       element != EL_MINE &&
       element != EL_MINE_ACTIVE &&
-      element != EL_BALL_GRAY &&
+      element != EL_GRAY_BALL &&
       element != EL_GRAY_BALL_ACTIVE &&
       element != EL_BLOCK_STONE &&
       element != EL_BLOCK_WOOD &&
@@ -3512,7 +3512,7 @@ static void GameActions_MM_Ext(void)
     DrawGraphic_MM(ELX, ELY, IMG_MM_FUSE);
   }
 
-  if (element == EL_BALL_GRAY && CT > native_mm_level.time_ball)
+  if (element == EL_GRAY_BALL && CT > native_mm_level.time_ball)
   {
     if (!Store2[ELX][ELY])     // check if content element not yet determined
     {

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index 7efed84d1e1a78287ca65f78b0d6abce12963064..6d66ea084a8aa3e17044a5f81fe25babe96c4bb1 100644 (file)
--- a/src/game_mm/mm_main.h
+++ b/src/game_mm/mm_main.h
@@ -389,7 +389,7 @@ extern int          num_element_info;
 #define EL_WALL_AMOEBA_END     EL_WALL_63
 #define EL_WALL_END            EL_WALL_63
 #define EL_BLOCK_WOOD          96
-#define EL_BALL_GRAY           97
+#define EL_GRAY_BALL           97
 #define EL_BEAMER_START                98
 #define EL_BEAMER_00           (EL_BEAMER_START + 0)
 #define EL_BEAMER_01           (EL_BEAMER_START + 1)

diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c
index f097e2c121ed839b44369423b29cae2b934bc69f..59c59d25737982bc64883d8abb1a763626b8d693 100644 (file)
--- a/src/game_mm/mm_tools.c
+++ b/src/game_mm/mm_tools.c
@@ -525,9 +525,9 @@ void DrawElement_MM(int x, int y, int element)
           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_BALL_GRAY, MM_ACTION_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)