changed order of some structures in EM engine

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

diff --git a/src/game_em/emerald.h b/src/game_em/emerald.h
index 0bb0993b34e9dc46312a9255c0f6dc77a0845b5f..50038d4d2135a3ed5cba9a795d4a0514b6370f1f 100644 (file)
--- a/src/game_em/emerald.h
+++ b/src/game_em/emerald.h
@@ -572,7 +572,7 @@ enum
 
 enum
 {
-  SOUND_blank = 0,     /* player walks on blank */
+  SOUND_blank,         /* player walks on blank */
   SOUND_roll,          /* player pushes stone/bomb/nut/spring */
   SOUND_stone,         /* stone hits ground */
   SOUND_nut,           /* nut hits ground */
@@ -616,6 +616,37 @@ enum
 // data structure definitions
 // ----------------------------------------------------------------------------
 
+/* structure used by logic() for gameplay */
+
+struct PLAYER
+{
+  int num;
+  int exists;
+  int alive_initial;
+  int alive;
+
+  int dynamite;
+  int dynamite_cnt;
+  int keys;
+  int anim;
+
+  int x;
+  int y;
+  int oldx;
+  int oldy;
+
+  int last_move_dir;
+
+  int joy_n:1;
+  int joy_e:1;
+  int joy_s:1;
+  int joy_w:1;
+  int joy_snap:1;
+  int joy_drop:1;
+  int joy_stick:1;
+  int joy_spin:1;
+};
+
 struct LOGIC
 {
   int width;                   /* cave width */
@@ -678,6 +709,7 @@ struct LOGIC
   int home;                    /* number of players not yet at home */
                                /* 0 == all players at home */
 
+  boolean testmode;            /* test mode */
   boolean killed_out_of_time;  /* kill player due to time out */
 
   int exit_x, exit_y;          /* kludge for playing player exit sound */
@@ -702,33 +734,4 @@ struct LOGIC
   short **boom;
 };
 
-struct PLAYER
-{
-  int num;
-  int exists;
-  int alive_initial;
-  int alive;
-
-  int dynamite;
-  int dynamite_cnt;
-  int keys;
-  int anim;
-
-  int x;
-  int y;
-  int oldx;
-  int oldy;
-
-  int last_move_dir;
-
-  int joy_n:1;
-  int joy_e:1;
-  int joy_s:1;
-  int joy_w:1;
-  int joy_snap:1;
-  int joy_drop:1;
-  int joy_stick:1;
-  int joy_spin:1;
-};
-
 #endif // EMERALD_H