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

diff --git a/src/main.h b/src/main.h
index f808f754..705582ab 100644
--- a/src/main.h
+++ b/src/main.h
@@ -17,30 +17,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-
-#ifndef MSDOS
-#define XK_MISCELLANY
-#define XK_LATIN1
-
-/*
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-#include <X11/keysymdef.h>
-*/
-
-#ifdef   XPM_INCLUDE_FILE
-#define  USE_XPM_LIBRARY
-#include XPM_INCLUDE_FILE
-#endif
-#else	/* MSDOS */
-#include "msdos.h"
-#endif  /* MSDOS */
+#include <unistd.h>
+#include <fcntl.h>
 
 #ifdef DEBUG
 #define DEBUG_TIMING	0
@@ -59,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)
@@ -265,6 +249,7 @@ struct OptionInfo
   boolean serveronly;
   boolean network;
   boolean verbose;
+  boolean debug;
 };
 
 struct SetupJoystickInfo
@@ -312,6 +297,7 @@ struct SetupInfo
   boolean team_mode;
   boolean handicap;
   boolean time_limit;
+  boolean fullscreen;
 
   struct SetupInputInfo input[MAX_PLAYERS];
 };
@@ -460,7 +446,9 @@ struct GameInfo
 
 struct GlobalInfo
 {
-  int dummy;
+  float frames_per_second;
+  boolean fps_slowdown;
+  int fps_slowdown_factor;
 };
 
 extern Display	       *display;
@@ -472,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[];
 
@@ -494,8 +477,8 @@ 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;
 
 extern boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
@@ -542,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
@@ -1608,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
@@ -1667,11 +1651,14 @@ extern char		*element_info[];
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
 
-#define PROGRAM_VERSION_STRING	"1.4.0 SDL"
+#define PROGRAM_VERSION_STRING	"1.5.0"
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
-#define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING
-#define COPYRIGHT_STRING	"Copyright ^1995-99 by " PROGRAM_AUTHOR_STRING
+#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 " " TARGET_STRING
+#define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
+#define WINDOW_SUBTITLE_STRING	PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING
 
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"
@@ -1689,9 +1676,9 @@ extern char		*element_info[];
 #define MB_MENU_CHOICE		FALSE
 #define MB_MENU_MARK		TRUE
 #define MB_MENU_INITIALIZE	(-1)
-#define MB_LEFT			1
-#define MB_MIDDLE		2
-#define MB_RIGHT		3
+#define MB_LEFTBUTTON		1
+#define MB_MIDDLEBUTTON		2
+#define MB_RIGHTBUTTON		3
 
 /* values for redraw_mask */
 #define REDRAW_ALL		(1 << 0)
@@ -1713,6 +1700,7 @@ extern char		*element_info[];
 #define REDRAW_MAIN		(REDRAW_FIELD | \
 				 REDRAW_TILES | \
 				 REDRAW_MICROLEVEL)
+#define REDRAW_FPS		(1 << 10)
 #define REDRAWTILES_THRESHOLD	(SCR_FIELDX * SCR_FIELDY / 2)
 
 /* areas in bitmap PIX_DOOR */