X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Femerald.h;h=0bb0993b34e9dc46312a9255c0f6dc77a0845b5f;hb=93d40da6020c70d47690dabb0498648bfb46da1a;hp=7822b1604bcdfee08b0ce4d96419dbd7c748eac7;hpb=449875f76f4db3321d90bdca0b7060c2e53e8ba9;p=rocksndiamonds.git

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 7822b160..0bb0993b 100644
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -77,9 +77,11 @@ enum
   Ztank,		/* internal tank/alien/bomb explosion */
   Zeater,		/* internal eater explosion */
   Zdynamite,		/* internal dynamite explosion */
+  Zboom,		/* explosion */
 
+  Xchain,		/* chain explosion; transition to Zboom */
   Xboom_bug,		/* bug explosion; transition to Zbug */
-  Xboom_bomb,		/* tank/alien/bomb explosion; transition to Ztank */
+  Xboom_tank,		/* tank/alien/bomb explosion; transition to Ztank */
   Xboom_android,	/* android explosion; transition to Xboom_2 */
   Xboom_1,		/* tile explosion; transition to Xboom_2 */
   Xboom_2,		/* transition to boom[] */
@@ -124,12 +126,12 @@ enum
 
   Xandroid,
   Xandroid_1_n,
-  Xandroid_2_n,
   Xandroid_1_e,
-  Xandroid_2_e,
   Xandroid_1_w,
-  Xandroid_2_w,
   Xandroid_1_s,
+  Xandroid_2_n,
+  Xandroid_2_e,
+  Xandroid_2_w,
   Xandroid_2_s,
   Yandroid_n,
   Yandroid_nB,
@@ -492,7 +494,7 @@ enum
   Xalpha_8,
   Xalpha_9,
   Xalpha_excla,
-  Xalpha_quote,
+  Xalpha_apost,
   Xalpha_comma,
   Xalpha_minus,
   Xalpha_perio,
@@ -541,7 +543,7 @@ enum
   Ygrass_blank,
   Ydirt_blank,
 
-  TILE_MAX
+  GAME_TILE_MAX
 };
 
 /* other definitions */
@@ -682,7 +684,7 @@ struct LOGIC
 
   short eater_array[8][9];		/* eater data */
   short ball_array[8][8];		/* ball data */
-  short android_array[TILE_MAX];	/* android clone data */
+  short android_array[GAME_TILE_MAX];	/* android clone data */
 
   short cavebuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
   short nextbuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];