X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=42eeba637cf089862a856f9a57e48432252fde74;hb=2443a8a09966a9940e1420c91d24a297325c2a00;hp=0768ed90f69f70d787589b323a6bcbf38f1c53ca;hpb=41e8d55b767c898f20c29a1b0b8d2ef8840be2f5;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 0768ed90..42eeba63 100644
--- a/src/main.h
+++ b/src/main.h
@@ -302,9 +302,12 @@ struct TapeInfo
   boolean pause_before_death;
   boolean recording, playing, pausing;
   boolean fast_forward;
+  boolean index_search;
+  boolean quick_resume;
   boolean changed;
   boolean player_participates[MAX_PLAYERS];
   int num_participating_players;
+
   struct
   {
     byte action[MAX_PLAYERS];
@@ -341,15 +344,11 @@ extern Pixmap		tile_clipmask[];
 extern DrawBuffer      *fieldbuffer;
 extern DrawBuffer      *drawto_field;
 
-extern int		joystick_device;
-extern char	       *joystick_device_name[];
-
 extern int		game_status;
 extern boolean		level_editor_test_game;
 extern boolean		network_playing;
 
 extern int		key_joystick_mapping;
-extern int	    	global_joystick_status;
 
 extern boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
@@ -1450,8 +1449,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
@@ -1467,6 +1464,8 @@ extern int		num_element_info;
 #define WINDOW_SUBTITLE_STRING	PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING
 #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"