changed some EM engine game element names

[rocksndiamonds.git] / src / game_em / tab_generate.c

diff --git a/src/game_em/tab_generate.c b/src/game_em/tab_generate.c
index c532f7d39cd7481242b07c630b6c0e99cf5a43d6..2d7c114843aeeadf0bae82edce23ffa381a650fc 100644 (file)
--- a/src/game_em/tab_generate.c
+++ b/src/game_em/tab_generate.c
@@ -20,9 +20,8 @@
 int tile_blank[] =
 {
   Xblank, 1,
-  Xacid_splash_e, 1,
-  Xacid_splash_w, 1,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+  Xsplash_e, 1,
+  Xsplash_w, 1,
   Xfake_acid_1, 1,
   Xfake_acid_2, 1,
   Xfake_acid_3, 1,
@@ -31,7 +30,6 @@ int tile_blank[] =
   Xfake_acid_6, 1,
   Xfake_acid_7, 1,
   Xfake_acid_8, 1,
-#endif
   TILE_MAX
 };
 
@@ -39,9 +37,8 @@ int tile_blank[] =
 int tile_acid[] =
 {
   Xblank, 1,
-  Xacid_splash_e, 1,
-  Xacid_splash_w, 1,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+  Xsplash_e, 1,
+  Xsplash_w, 1,
   Xfake_acid_1, 1,
   Xfake_acid_2, 1,
   Xfake_acid_3, 1,
@@ -50,7 +47,6 @@ int tile_acid[] =
   Xfake_acid_6, 1,
   Xfake_acid_7, 1,
   Xfake_acid_8, 1,
-#endif
   Xacid_1, 1,
   Xacid_2, 1,
   Xacid_3, 1,
@@ -65,7 +61,6 @@ int tile_acid[] =
 /* 0=stop 1=fake_acid */
 int tile_fake_acid[] =
 {
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
   Xfake_acid_1, 1,
   Xfake_acid_2, 1,
   Xfake_acid_3, 1,
@@ -74,7 +69,6 @@ int tile_fake_acid[] =
   Xfake_acid_6, 1,
   Xfake_acid_7, 1,
   Xfake_acid_8, 1,
-#endif
   TILE_MAX
 };
 
@@ -98,9 +92,8 @@ int tile_amoeba[] =
 int tile_android_move[] =
 {
   Xblank, 1,
-  Xacid_splash_e, 1,
-  Xacid_splash_w, 1,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+  Xsplash_e, 1,
+  Xsplash_w, 1,
   Xfake_acid_1, 1,
   Xfake_acid_2, 1,
   Xfake_acid_3, 1,
@@ -109,7 +102,6 @@ int tile_android_move[] =
   Xfake_acid_6, 1,
   Xfake_acid_7, 1,
   Xfake_acid_8, 1,
-#endif
   Xplant, 1,
   TILE_MAX
 };
@@ -2824,23 +2816,23 @@ int obj_map[] =
   Xacid_8, 6,
   Xacid_8, 7,
   -1,
-  Xacid_splash_w, 4,
-  Xacid_splash_w, 5,
+  Xsplash_w, 4,
+  Xsplash_w, 5,
   -1,
-  Xacid_splash_w, 2,
-  Xacid_splash_w, 3,
+  Xsplash_w, 2,
+  Xsplash_w, 3,
   -1,
-  Xacid_splash_w, 0,
-  Xacid_splash_w, 1,
+  Xsplash_w, 0,
+  Xsplash_w, 1,
   -1,
-  Xacid_splash_e, 4,
-  Xacid_splash_e, 5,
+  Xsplash_e, 4,
+  Xsplash_e, 5,
   -1,
-  Xacid_splash_e, 2,
-  Xacid_splash_e, 3,
+  Xsplash_e, 2,
+  Xsplash_e, 3,
   -1,
-  Xacid_splash_e, 0,
-  Xacid_splash_e, 1,
+  Xsplash_e, 0,
+  Xsplash_e, 1,
   -1,
 
   Yball_2, 7,
@@ -2892,53 +2884,53 @@ int obj_map[] =
   Yball_2, 6,
   -1,
 
-  Yslidewall_ew_blank, 7,
-  Xslidewall_ew, 0,
-  Xslidewall_ew, 1,
-  Xslidewall_ew, 2,
-  Xslidewall_ew, 3,
-  Xslidewall_ew, 4,
-  Xslidewall_ew, 5,
-  Xslidewall_ew, 6,
-  Xslidewall_ew, 7,
+  Yslide_ew_blank, 7,
+  Xslide_ew, 0,
+  Xslide_ew, 1,
+  Xslide_ew, 2,
+  Xslide_ew, 3,
+  Xslide_ew, 4,
+  Xslide_ew, 5,
+  Xslide_ew, 6,
+  Xslide_ew, 7,
   -1,
-  Yslidewall_ew_blank, 0,
+  Yslide_ew_blank, 0,
   -1,
-  Yslidewall_ew_blank, 1,
+  Yslide_ew_blank, 1,
   -1,
-  Yslidewall_ew_blank, 2,
+  Yslide_ew_blank, 2,
   -1,
-  Yslidewall_ew_blank, 3,
+  Yslide_ew_blank, 3,
   -1,
-  Yslidewall_ew_blank, 4,
+  Yslide_ew_blank, 4,
   -1,
-  Yslidewall_ew_blank, 5,
+  Yslide_ew_blank, 5,
   -1,
-  Yslidewall_ew_blank, 6,
+  Yslide_ew_blank, 6,
   -1,
-  Yslidewall_ns_blank, 7,
-  Xslidewall_ns, 0,
-  Xslidewall_ns, 1,
-  Xslidewall_ns, 2,
-  Xslidewall_ns, 3,
-  Xslidewall_ns, 4,
-  Xslidewall_ns, 5,
-  Xslidewall_ns, 6,
-  Xslidewall_ns, 7,
+  Yslide_ns_blank, 7,
+  Xslide_ns, 0,
+  Xslide_ns, 1,
+  Xslide_ns, 2,
+  Xslide_ns, 3,
+  Xslide_ns, 4,
+  Xslide_ns, 5,
+  Xslide_ns, 6,
+  Xslide_ns, 7,
   -1,
-  Yslidewall_ns_blank, 0,
+  Yslide_ns_blank, 0,
   -1,
-  Yslidewall_ns_blank, 1,
+  Yslide_ns_blank, 1,
   -1,
-  Yslidewall_ns_blank, 2,
+  Yslide_ns_blank, 2,
   -1,
-  Yslidewall_ns_blank, 3,
+  Yslide_ns_blank, 3,
   -1,
-  Yslidewall_ns_blank, 4,
+  Yslide_ns_blank, 4,
   -1,
-  Yslidewall_ns_blank, 5,
+  Yslide_ns_blank, 5,
   -1,
-  Yslidewall_ns_blank, 6,
+  Yslide_ns_blank, 6,
   -1,
 
   XwonderwallB, 7,