rnd-20020428-3-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 40b0676458638b99d7c8ac6e97724c81f4707513..18d355d045aad8aabe748ce49aa35874ffcbd327 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -156,7 +156,7 @@
 #define IS_DRAWABLE(e)         ((e) < EL_BLOCKED)
 #define IS_NOT_DRAWABLE(e)     ((e) >= EL_BLOCKED)
 #define TAPE_IS_EMPTY(x)       ((x).length == 0)
-#define TAPE_IS_STOPPED(x)     (!(x).recording && !(x).playing &&!(x).pausing)
+#define TAPE_IS_STOPPED(x)     (!(x).recording && !(x).playing)
 
 #define PLAYERINFO(x,y)                (&stored_player[StorePlayer[x][y]-EL_SPIELER1])
 #define SHIELD_ON(p)           ((p)->shield_passive_time_left > 0)
@@ -234,12 +234,12 @@ struct PlayerInfo
   boolean LevelSolved, GameOver;
   boolean snapped;
 
-  unsigned long move_delay;
-  int move_delay_value;
-
   int last_move_dir;
   int is_moving;
 
+  unsigned long move_delay;
+  int move_delay_value;
+
   unsigned long push_delay;
   unsigned long push_delay_value;
 
@@ -302,9 +302,13 @@ struct TapeInfo
   boolean pause_before_death;
   boolean recording, playing, pausing;
   boolean fast_forward;
+  boolean index_search;
+  boolean quick_resume;
+  boolean single_step;
   boolean changed;
   boolean player_participates[MAX_PLAYERS];
   int num_participating_players;
+
   struct
   {
     byte action[MAX_PLAYERS];
@@ -337,8 +341,6 @@ struct GlobalInfo
 
 extern GC              tile_clip_gc;
 extern Bitmap         *pix[];
-extern Bitmap         *pix_default[];
-extern Bitmap         *pix_custom[];
 extern Pixmap          tile_clipmask[];
 extern DrawBuffer      *fieldbuffer;
 extern DrawBuffer      *drawto_field;
@@ -396,8 +398,6 @@ extern struct GameInfo              game;
 extern struct GlobalInfo       global;
 
 extern char            *sound_name[];
-extern int             background_loop[];
-extern int             num_bg_loops;
 extern char            *element_info[];
 extern int             num_element_info;
 
@@ -1438,6 +1438,15 @@ extern int               num_element_info;
 
 #define NUM_SOUNDS             55
 
+
+/* sound effects */
+#define SND_TEST1              0
+#define SND_TEST2              1
+#define SND_TEST3              2
+
+#define NUM_SOUND_EFFECTS      3
+
+
 /* values for game_status */
 #define EXITGAME               0
 #define MAINMENU               1
@@ -1448,8 +1457,6 @@ extern int                num_element_info;
 #define TYPENAME               6
 #define HALLOFFAME             7
 #define SETUP                  8
-#define SETUPINPUT             9
-#define CALIBRATION            10
 
 #define PROGRAM_VERSION_MAJOR  2
 #define PROGRAM_VERSION_MINOR  0