X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.h;h=36446707261a822830078df26832c62380981836;hb=724fbe31d039f8b7272f45b18f18a8d9ea2281df;hp=936f2848fa1b211af2832eebf5d293202f1df112;hpb=56be9668e4ff713c8fff9b105f0913dd4d373cb1;p=rocksndiamonds.git

diff --git a/src/game_em/cave.h b/src/game_em/cave.h
index 936f2848..36446707 100644
--- a/src/game_em/cave.h
+++ b/src/game_em/cave.h
@@ -8,25 +8,25 @@
 
 struct CAVE
 {
-  int width;			/* playfield width */
-  int height;			/* playfield height */
+  int width;			/* cave width */
+  int height;			/* cave height */
 
   int player_x[MAX_PLAYERS];	/* player x pos */
   int player_y[MAX_PLAYERS];	/* player y pos */
 
   int time_seconds;		/* available time (seconds) */
-  int required_initial;		/* emeralds needed */
+  int required;			/* emeralds needed */
 
   int alien_score;		/* score for killing alien */
   int amoeba_time;		/* amoeba speed */
-  int android_move_cnt_initial;	/* android move counter (initial) */
+  int android_move_cnt;		/* android move counter */
   int android_move_time;	/* android move reset time */
-  int android_clone_cnt_initial;/* android clone counter (initial) */
+  int android_clone_cnt;	/* android clone counter */
   int android_clone_time;	/* android clone reset time */
   int ball_cnt;			/* ball counter */
   int ball_pos;			/* ball array pos counter */
   int ball_random;		/* ball is random flag */
-  int ball_state_initial;	/* ball active flag (initial) */
+  int ball_state;		/* ball active flag */
   int ball_time;		/* ball reset time */
   int bug_score;		/* score for killing bug */
   int diamond_score;		/* score for collecting diamond */
@@ -36,25 +36,25 @@ struct CAVE
   int emerald_score;		/* score for collecting emerald */
   int exit_score;		/* score for entering exit */
   int key_score;		/* score for colleting key */
-  int lenses_cnt_initial;	/* lenses counter (initial) */
+  int lenses_cnt;		/* lenses counter */
   int lenses_score;		/* score for collecting lenses */
   int lenses_time;		/* lenses reset time */
-  int magnify_cnt_initial;	/* magnify counter (initial) */
+  int magnify_cnt;		/* magnify counter */
   int magnify_score;		/* score for collecting magnifier */
   int magnify_time;		/* magnify reset time */
   int nut_score;		/* score for cracking nut */
   int shine_cnt;		/* shine counter for emerald/diamond */
   int slurp_score;		/* score for slurping alien */
   int tank_score;		/* score for killing tank */
-  int wheel_cnt_initial;	/* wheel counter (initial) */
-  int wheel_x_initial;		/* wheel x pos (initial) */
-  int wheel_y_initial;		/* wheel y pos (initial) */
+  int wheel_cnt;		/* wheel counter */
+  int wheel_x;			/* wheel x pos */
+  int wheel_y;			/* wheel y pos */
   int wheel_time;		/* wheel reset time */
-  int wind_cnt_initial;		/* wind counter (initial) */
-  int wind_direction_initial;	/* wind direction (initial) */
+  int wind_cnt;			/* wind time counter */
+  int wind_direction;		/* wind direction */
   int wind_time;		/* wind reset time */
-  int wonderwall_state_initial;	/* wonderwall active flag (initial) */
-  int wonderwall_time_initial;	/* wonderwall time (initial) */
+  int wonderwall_state;		/* wonderwall active flag */
+  int wonderwall_time;		/* wonderwall time */
 
   int num_ball_arrays;		/* number of ball data arrays used */
 
@@ -62,7 +62,7 @@ struct CAVE
   short ball_array[8][8];		/* ball data */
   short android_array[TILE_MAX];	/* android clone table */
 
-  short cave_raw[CAVE_WIDTH][CAVE_HEIGHT];
+  short cave[CAVE_WIDTH][CAVE_HEIGHT];	/* cave data */
 };
 
 #endif	// CAVE_H