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

diff --git a/src/game_em/cave.h b/src/game_em/cave.h
index 36446707..133681c6 100644
--- a/src/game_em/cave.h
+++ b/src/game_em/cave.h
@@ -17,50 +17,46 @@ struct CAVE
   int time_seconds;		/* available time (seconds) */
   int required;			/* emeralds needed */
 
+  int eater_score;		/* score for killing eater */
   int alien_score;		/* score for killing alien */
-  int amoeba_time;		/* amoeba speed */
-  int android_move_cnt;		/* android move counter */
-  int android_move_time;	/* android move reset time */
-  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;		/* ball active flag */
-  int ball_time;		/* ball reset time */
   int bug_score;		/* score for killing bug */
+  int tank_score;		/* score for killing tank */
+  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 eater_pos;		/* eater array pos */
-  int eater_score;		/* score for killing eater */
-  int emerald_score;		/* score for collecting emerald */
-  int exit_score;		/* score for entering exit */
   int key_score;		/* score for colleting key */
-  int lenses_cnt;		/* lenses counter */
   int lenses_score;		/* score for collecting lenses */
-  int lenses_time;		/* lenses reset time */
-  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;		/* wheel counter */
+  int exit_score;		/* score for entering exit */
+
+  int android_move_time;	/* android move reset time */
+  int android_clone_time;	/* android clone reset time */
+  int ball_time;		/* ball reset time */
+  int amoeba_time;		/* amoeba speed */
+  int wonderwall_time;		/* wonderwall time */
+  int wheel_time;		/* wheel reset time */
   int wheel_x;			/* wheel x pos */
   int wheel_y;			/* wheel y pos */
-  int wheel_time;		/* wheel reset time */
-  int wind_cnt;			/* wind time counter */
-  int wind_direction;		/* wind direction */
+  int lenses_time;		/* lenses reset time */
+  int magnify_time;		/* magnify reset time */
   int wind_time;		/* wind reset time */
+  int wind_direction;		/* wind direction */
+
+  int ball_random;		/* ball is random flag */
+  int ball_state;		/* ball active flag */
   int wonderwall_state;		/* wonderwall active flag */
-  int wonderwall_time;		/* wonderwall time */
+  int wheel_cnt;		/* wheel counter */
+  int lenses_cnt;		/* lenses counter */
+  int magnify_cnt;		/* magnify counter */
+  int wind_cnt;			/* wind time counter */
 
   int num_ball_arrays;		/* number of ball data arrays used */
 
   short eater_array[8][9];		/* eater data */
   short ball_array[8][8];		/* ball data */
-  short android_array[TILE_MAX];	/* android clone table */
+  short android_array[TILE_MAX];	/* android clone data */
 
   short cave[CAVE_WIDTH][CAVE_HEIGHT];	/* cave data */
 };