X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=705582abe1614c5ab6358c29e7f1a21148b560c7;hb=1150bdce04915bf329bd816307fb2507eba80e15;hp=dfec496c843bb5491109a66fa61c187e2f4faa77;hpb=8eee8a56a5aae567522998ccddf929e38aed6872;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index dfec496c..705582ab 100644
--- a/src/main.h
+++ b/src/main.h
@@ -41,13 +41,15 @@ typedef unsigned char byte;
 #define WIN_XSIZE	672
 #define WIN_YSIZE	560
 #define WIN_SDL_DEPTH	16	/* !!! change this !!! */
-#ifndef MSDOS
+
+#if !defined(PLATFORM_MSDOS)
 #define WIN_XPOS	0
 #define WIN_YPOS	0
-#else	/* MSDOS */
+#else
 #define WIN_XPOS	((XRES - WIN_XSIZE) / 2)
 #define WIN_YPOS	((YRES - WIN_YSIZE) / 2)
-#endif	/* MSDOS */
+#endif
+
 #define SCR_FIELDX	17
 #define SCR_FIELDY	17
 #define MAX_BUF_XSIZE	(SCR_FIELDX + 2)
@@ -445,6 +447,8 @@ struct GameInfo
 struct GlobalInfo
 {
   float frames_per_second;
+  boolean fps_slowdown;
+  int fps_slowdown_factor;
 };
 
 extern Display	       *display;
@@ -456,16 +460,11 @@ extern Bitmap		pix[];
 extern Bitmap		pix_masked[], tile_masked[];
 extern Pixmap		clipmask[], tile_clipmask[];
 
-#ifdef USE_XPM_LIBRARY
-extern XpmAttributes 	xpm_att[];
-#endif
-
 extern DrawBuffer	drawto, drawto_field, backbuffer, fieldbuffer;
 extern Colormap		cmap;
 
-extern int		sound_pipe[2];
-extern int		sound_device;
 extern char	       *sound_device_name;
+
 extern int		joystick_device;
 extern char	       *joystick_device_name[];
 
@@ -478,8 +477,6 @@ extern int		button_status;
 extern boolean		motion_status;
 extern int		key_joystick_mapping;
 extern int	    	global_joystick_status, joystick_status;
-extern int		sound_status;
-extern boolean		sound_loops_allowed;
 extern boolean		fullscreen_available;
 extern boolean		fullscreen_enabled;
 
@@ -528,18 +525,19 @@ extern struct LevelInfo		level;
 extern struct PlayerInfo	stored_player[], *local_player;
 extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
-extern struct SoundInfo		Sound[];
+extern struct SampleInfo	Sound[];
 extern struct JoystickInfo	joystick[];
 extern struct OptionInfo	options;
 extern struct SetupInfo		setup;
 extern struct GameInfo		game;
+extern struct SystemInfo	sysinfo;
 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;
 
 /* often used screen positions */
 #define SX			8
@@ -1594,14 +1592,14 @@ extern char		*element_info[];
 #define NUM_SOUNDS		62
 
 /* default input keys */
-#define DEFAULT_KEY_LEFT	KEY_Left
-#define DEFAULT_KEY_RIGHT	KEY_Right
-#define DEFAULT_KEY_UP		KEY_Up
-#define DEFAULT_KEY_DOWN	KEY_Down
-#define DEFAULT_KEY_SNAP	KEY_Shift_L
-#define DEFAULT_KEY_BOMB	KEY_Shift_R
-#define DEFAULT_KEY_OKAY	KEY_Return
-#define DEFAULT_KEY_CANCEL	KEY_Escape
+#define DEFAULT_KEY_LEFT	KSYM_Left
+#define DEFAULT_KEY_RIGHT	KSYM_Right
+#define DEFAULT_KEY_UP		KSYM_Up
+#define DEFAULT_KEY_DOWN	KSYM_Down
+#define DEFAULT_KEY_SNAP	KSYM_Shift_L
+#define DEFAULT_KEY_BOMB	KSYM_Shift_R
+#define DEFAULT_KEY_OKAY	KSYM_Return
+#define DEFAULT_KEY_CANCEL	KSYM_Escape
 
 /* directions for moving */
 #define MV_NO_MOVING		0
@@ -1658,7 +1656,7 @@ extern char		*element_info[];
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
 #define PROGRAM_RIGHTS_STRING	"Copyright ^1995-2000 by"
 #define PROGRAM_DOS_PORT_STRING	"DOS port done by Guido Schulz"
-#define PROGRAM_IDENT_STRING	PROGRAM_VERSION_STRING " " PLATFORM_STRING
+#define PROGRAM_IDENT_STRING	PROGRAM_VERSION_STRING " " TARGET_STRING
 #define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
 #define WINDOW_SUBTITLE_STRING	PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING