changed some EM engine game element names

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 17f709853ebef7e9625058eeb1508e59ad963d7c..116cde4bfb2bd51708dbde2142cff266e0f9311d 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -869,7 +869,7 @@ void convert_em_level(unsigned char *src, int file_version)
   if (temp & 2048)
   {
     lev.android_array[Xfake_amoeba]    = Xdrip;
-    lev.android_array[Xfake_amoebaB]   = Xdrip;
+    lev.android_array[Yfake_amoeba]    = Xdrip;
     lev.android_array[Xamoeba_1]       = Xdrip;
     lev.android_array[Xamoeba_2]       = Xdrip;
     lev.android_array[Xamoeba_3]       = Xdrip;

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 4e2d8ab99a875eddc5a1c0e07be491f59192f33c..37b75c66e4be259c95280bcb399c2eb87f05b814 100644 (file)
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -60,9 +60,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
   -----------------------------------------------------------------------------
   definition of elements used in the Emerald Mine Club engine;
-  the element names have the following properties:
+  the element names (mostly) have the following properties:
   - elements that start with 'X' can be stored in a level file
-  - elements that start with 'Y' indicate moving elements
+  - elements that start with 'Y' indicate moving or active elements
   - elements that end with 'B' are the "backside" of moving elements
   -----------------------------------------------------------------------------
 */
@@ -370,16 +370,16 @@ enum
   Ydrip_2_sB,
 
   Xwonderwall,
-  XwonderwallB,
+  Ywonderwall,
 
   Xwheel,
-  XwheelB,
+  Ywheel,
 
   Xswitch,
-  XswitchB,
+  Yswitch,
 
   Xbumper,
-  XbumperB,
+  Ybumper,
 
   Xacid_nw,
   Xacid_ne,
@@ -388,13 +388,13 @@ enum
   Xacid_se,
 
   Xfake_blank,
-  Xfake_blankB,
+  Yfake_blank,
 
   Xfake_grass,
-  Xfake_grassB,
+  Yfake_grass,
 
   Xfake_amoeba,                        /* dripper */
-  Xfake_amoebaB,
+  Yfake_amoeba,
 
   Xlenses,
 

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index f50d93eff4e859888a5f7e3f21a0f8e7f1dc96a8..19930d24eba7d12cf920d40f787907ebca1fd2be 100644 (file)
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -71,7 +71,7 @@ static const byte is_fake_acid[TILE_MAX] =
 static const byte is_amoeba[TILE_MAX] =
 {
   [Xfake_amoeba]       = 1,
-  [Xfake_amoebaB]      = 1,
+  [Yfake_amoeba]       = 1,
   [Xamoeba_1]          = 1,
   [Xamoeba_2]          = 1,
   [Xamoeba_3]          = 1,
@@ -5090,7 +5090,7 @@ static void Lspring(int x, int y)
          next[x][y] = Xblank;
          cave[x+1][y] = Yspring_e;
          if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
+           cave[x][y+1] = Ybumper;
 
 #ifdef SPRING_ROLL
          next[x+1][y] = Xspring_e;
@@ -5106,7 +5106,7 @@ static void Lspring(int x, int y)
          next[x][y] = Xblank;
          cave[x-1][y] = Yspring_w;
          if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
+           cave[x][y+1] = Ybumper;
 
 #ifdef SPRING_ROLL
          next[x-1][y] = Xspring_w;
@@ -5124,7 +5124,7 @@ static void Lspring(int x, int y)
          next[x][y] = Xblank;
          cave[x-1][y] = Yspring_w;
          if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
+           cave[x][y+1] = Ybumper;
 
 #ifdef SPRING_ROLL
          next[x-1][y] = Xspring_w;
@@ -5140,7 +5140,7 @@ static void Lspring(int x, int y)
          next[x][y] = Xblank;
          cave[x+1][y] = Yspring_e;
          if (cave[x][y+1] == Xbumper)
-           cave[x][y+1] = XbumperB;
+           cave[x][y+1] = Ybumper;
 
 #ifdef SPRING_ROLL
          next[x+1][y] = Xspring_e;
@@ -5237,7 +5237,7 @@ static void Lspring_e(int x, int y)
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x+1][y])
@@ -5295,8 +5295,8 @@ static void Lspring_e(int x, int y)
       return;
 
     case Xbumper:
-    case XbumperB:
-      cave[x+1][y] = XbumperB;
+    case Ybumper:
+      cave[x+1][y] = Ybumper;
       next[x][y] = Xspring_w;
       play_element_sound(x, y, SOUND_spring, Xspring);
       return;
@@ -5348,7 +5348,7 @@ static void Lspring_w(int x, int y)
       return;
 
     case Xbumper:
-      cave[x][y+1] = XbumperB;
+      cave[x][y+1] = Ybumper;
   }
 
   switch (cave[x-1][y])
@@ -5406,8 +5406,8 @@ static void Lspring_w(int x, int y)
       return;
 
     case Xbumper:
-    case XbumperB:
-      cave[x-1][y] = XbumperB;
+    case Ybumper:
+      cave[x-1][y] = Ybumper;
       next[x][y] = Xspring_e;
       play_element_sound(x, y, SOUND_spring, Xspring);
       return;
@@ -6311,7 +6311,7 @@ static void Lwonderwall(int x, int y)
 {
   if (lev.wonderwall_time && lev.wonderwall_state)
   {
-    cave[x][y] = XwonderwallB;
+    cave[x][y] = Ywonderwall;
     play_element_sound(x, y, SOUND_wonder, Xwonderwall);
   }
 }
@@ -6319,31 +6319,31 @@ static void Lwonderwall(int x, int y)
 static void Lwheel(int x, int y)
 {
   if (lev.wheel_cnt && x == lev.wheel_x && y == lev.wheel_y)
-    cave[x][y] = XwheelB;
+    cave[x][y] = Ywheel;
 }
 
 static void Lswitch(int x, int y)
 {
   if (lev.ball_state)
-    cave[x][y] = XswitchB;
+    cave[x][y] = Yswitch;
 }
 
 static void Lfake_blank(int x, int y)
 {
   if (lev.lenses_cnt)
-    cave[x][y] = Xfake_blankB;
+    cave[x][y] = Yfake_blank;
 }
 
 static void Lfake_grass(int x, int y)
 {
   if (lev.magnify_cnt)
-    cave[x][y] = Xfake_grassB;
+    cave[x][y] = Yfake_grass;
 }
 
 static void Lfake_amoeba(int x, int y)
 {
   if (lev.lenses_cnt)
-    cave[x][y] = Xfake_amoebaB;
+    cave[x][y] = Yfake_amoeba;
 }
 
 static void Lsand_stone(int x, int y)

diff --git a/src/tools.c b/src/tools.c
index ee3bf6a51af02bb3a10806b04ef390516240c6df..651fbb164f3ec7a1efa72f87bddeab3ba0424829 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -6862,7 +6862,7 @@ em_object_mapping_list[] =
     EL_MAGIC_WALL,                     -1, -1
   },
   {
-    XwonderwallB,                      FALSE,  FALSE,
+    Ywonderwall,                       FALSE,  FALSE,
     EL_MAGIC_WALL,                     ACTION_ACTIVE, -1
   },
 
@@ -6871,7 +6871,7 @@ em_object_mapping_list[] =
     EL_ROBOT_WHEEL,                    -1, -1
   },
   {
-    XwheelB,                           FALSE,  FALSE,
+    Ywheel,                            FALSE,  FALSE,
     EL_ROBOT_WHEEL,                    ACTION_ACTIVE, -1
   },
 
@@ -6880,7 +6880,7 @@ em_object_mapping_list[] =
     EL_EMC_MAGIC_BALL_SWITCH,          -1, -1
   },
   {
-    XswitchB,                          FALSE,  FALSE,
+    Yswitch,                           FALSE,  FALSE,
     EL_EMC_MAGIC_BALL_SWITCH,          ACTION_ACTIVE, -1
   },
 
@@ -6889,7 +6889,7 @@ em_object_mapping_list[] =
     EL_EMC_SPRING_BUMPER,              -1, -1
   },
   {
-    XbumperB,                          FALSE,  FALSE,
+    Ybumper,                           FALSE,  FALSE,
     EL_EMC_SPRING_BUMPER,              ACTION_ACTIVE, -1
   },
 
@@ -6919,7 +6919,7 @@ em_object_mapping_list[] =
     EL_INVISIBLE_WALL,                 -1, -1
   },
   {
-    Xfake_blankB,                      FALSE,  FALSE,
+    Yfake_blank,                       FALSE,  FALSE,
     EL_INVISIBLE_WALL,                 ACTION_ACTIVE, -1
   },
 
@@ -6928,7 +6928,7 @@ em_object_mapping_list[] =
     EL_EMC_FAKE_GRASS,                 -1, -1
   },
   {
-    Xfake_grassB,                      FALSE,  FALSE,
+    Yfake_grass,                       FALSE,  FALSE,
     EL_EMC_FAKE_GRASS,                 ACTION_ACTIVE, -1
   },
 
@@ -6937,7 +6937,7 @@ em_object_mapping_list[] =
     EL_EMC_DRIPPER,                    -1, -1
   },
   {
-    Xfake_amoebaB,                     FALSE,  FALSE,
+    Yfake_amoeba,                      FALSE,  FALSE,
     EL_EMC_DRIPPER,                    ACTION_ACTIVE, -1
   },