X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=18d355d045aad8aabe748ce49aa35874ffcbd327;hb=884db54d739f5838243315f390d28634cb99a7d9;hp=5c7c417ca749063e1de76aef780a4e556f7f9c78;hpb=e0e2697df0d0da483a91b1248c120aef6b3caf9b;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 5c7c417c..18d355d0 100644
--- 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];
@@ -394,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;
 
@@ -1436,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
@@ -1446,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
@@ -1464,6 +1473,7 @@ extern int		num_element_info;
 #define ICON_TITLE_STRING	PROGRAM_TITLE_STRING
 #define UNIX_USERDATA_DIRECTORY	".rocksndiamonds"
 #define COOKIE_PREFIX		"ROCKSNDIAMONDS"
+#define FILENAME_PREFIX		"Rocks"
 
 #define X11_ICON_FILENAME	"rocks_icon.xbm"
 #define X11_ICONMASK_FILENAME	"rocks_iconmask.xbm"