X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Femerald.h;h=3c79825e90a858482c42cac15d04342911603161;hb=9e54f3f605e0999f4f2d866107449c247493e957;hp=13854ac2868da25bccbf798eeec5f920d5efd532;hpb=dc394ec0acce55b93d0a79bd7990127dbad3d389;p=rocksndiamonds.git

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 13854ac2..3c79825e 100644
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -48,6 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // constant definitions
 // ----------------------------------------------------------------------------
 
+/* maximum cave size */
 #define CAVE_WIDTH			MAX_PLAYFIELD_WIDTH
 #define CAVE_HEIGHT			MAX_PLAYFIELD_HEIGHT
 
@@ -57,19 +58,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define CAVE_BUFFER_WIDTH		(CAVE_WIDTH  + 2 * CAVE_BUFFER_XOFFSET)
 #define CAVE_BUFFER_HEIGHT		(CAVE_HEIGHT + 2 * CAVE_BUFFER_YOFFSET)
 
-/*
-  -----------------------------------------------------------------------------
-  definition of elements used in the Emerald Mine Club engine;
-  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 or active elements
-  - elements that end with 'B' are the "backside" of moving elements
-  -----------------------------------------------------------------------------
-*/
+
+// ----------------------------------------------------------------------------
+// definition of elements used in the Emerald Mine Club engine;
+// the element names (mostly) have the following properties:
+// - elements that start with 'X' are not animated (more or less)
+// - elements that start with 'Y' are animated elements
+// - elements that start with 'Z' are internal elements (without graphics)
+// - elements that end with 'B' or '_blank' change to the "Xblank" element
+// ----------------------------------------------------------------------------
 
 enum
 {
-  Xblank = 0,
+  Zborder,		/* special code to indicate border */
+  Zplayer,		/* special code to indicate player */
+
+  Zbug,			/* internal bug explosion */
+  Ztank,		/* internal tank/alien/bomb explosion */
+  Zeater,		/* internal eater explosion */
+  Zdynamite,		/* internal dynamite explosion */
+
+  Xboom_bug,		/* bug explosion; transition to Zbug */
+  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[] */
+
+  Xblank,
 
   Xsplash_e,
   Xsplash_w,
@@ -526,25 +541,6 @@ enum
   Ygrass_blank,
   Ydirt_blank,
 
-  Xboom_bug,		/* passed from explode to synchro (linked explosion);
-			   transition to explode_normal */
-  Xboom_bomb,		/* passed from explode to synchro (linked explosion);
-			   transition to explode_normal */
-  Xboom_android,	/* passed from explode to synchro;
-			   transition to boom_2 */
-  Xboom_1,		/* passed from explode to synchro;
-			   transition to boom_2 */
-  Xboom_2,		/* transition to boom[] */
-
-  Znormal,		/* passed from synchro to explode, only in next[];
-			   no picture */
-  Zdynamite,		/* passed from synchro to explode, only in next[];
-			   no picture */
-  Zplayer,		/* special code to indicate player;
-			   no picture */
-  Zborder,		/* special code to indicate border;
-			   no picture */
-
   TILE_MAX
 };
 
@@ -629,17 +625,17 @@ struct LOGIC
   int bottom;			/* cave bottom edge */
 
   int time;			/* time remaining */
-  int required;			/* emeralds needed */
+  int gems_needed;		/* emeralds needed */
   int score;			/* score */
 
   int eater_score;		/* score for killing eater */
   int alien_score;		/* score for killing alien */
   int bug_score;		/* score for killing bug */
   int tank_score;		/* score for killing tank */
+  int slurp_score;		/* score for slurping alien with spring */
+  int nut_score;		/* score for cracking nut to emerald */
   int emerald_score;		/* score for collecting emerald */
   int diamond_score;		/* score for collecting diamond */
-  int nut_score;		/* score for cracking nut */
-  int slurp_score;		/* score for slurping alien with spring */
   int dynamite_score;		/* score for collecting dynamite */
   int key_score;		/* score for colleting key */
   int lenses_score;		/* score for collecting lenses */