changed some EM engine game element names

[rocksndiamonds.git] / src / game_em / emerald.h

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 52a81bcead61b0786fb825fd4f4dd1ce6cddd6df..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
   -----------------------------------------------------------------------------
 */
@@ -71,8 +71,8 @@ enum
 {
   Xblank = 0,
 
-  Xacid_splash_e,
-  Xacid_splash_w,
+  Xsplash_e,
+  Xsplash_w,
 
   Xplant,
   Yplant,
@@ -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,
 
@@ -419,10 +419,10 @@ enum
   Xsand_stonesand_quickout_1,  /* newly added to EM engine */
   Xsand_stonesand_quickout_2,
 
-  Xslidewall_ns,               /* growing wall */
-  Yslidewall_ns_blank,
-  Xslidewall_ew,
-  Yslidewall_ew_blank,
+  Xslide_ns,                   /* growing wall */
+  Yslide_ns_blank,
+  Xslide_ew,
+  Yslide_ew_blank,
 
   Xwind_n,
   Xwind_e,
@@ -597,7 +597,7 @@ enum
   SOUND_dirt,          /* player digs into dirt */
   SOUND_acid,          /* acid splashes */
   SOUND_ball,          /* ball places something */
-  SOUND_slidewall,     /* slide wall grows */
+  SOUND_slide,         /* slide wall grows */
   SOUND_wonder,                /* wonderwall is active */
   SOUND_door,          /* player goes thru door (gate) */
   SOUND_exit_open,     /* exit opens */