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

diff --git a/src/main.h b/src/main.h
index 705582ab..9eb316c2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -28,10 +28,9 @@
 #define DEBUG_TIMING	0
 #endif
 
-typedef unsigned char boolean;
-typedef unsigned char byte;
-
-#include "system.h"
+#if 0
+#include "libgame/libgame.h"
+#endif
 
 #ifndef FALSE
 #define FALSE		0
@@ -201,12 +200,11 @@ typedef unsigned char byte;
 #define PIX_SMALLFONT		8
 #define PIX_MEDIUMFONT		9
 /* Bitmaps without graphic file */
-#define PIX_DB_BACK		10
-#define PIX_DB_DOOR		11
-#define PIX_DB_FIELD		12
+#define PIX_DB_DOOR		10
+#define PIX_DB_FIELD		11
 
 #define NUM_PICTURES		10
-#define NUM_BITMAPS		13
+#define NUM_BITMAPS		12
 
 /* boundaries of arrays etc. */
 #define MAX_PLAYER_NAME_LEN	10
@@ -238,20 +236,6 @@ struct HiScore
   int Score;
 };
 
-struct OptionInfo
-{
-  char *display_name;
-  char *server_host;
-  int server_port;
-  char *ro_base_directory;
-  char *rw_base_directory;
-  char *level_directory;
-  boolean serveronly;
-  boolean network;
-  boolean verbose;
-  boolean debug;
-};
-
 struct SetupJoystickInfo
 {
   char *device_name;
@@ -451,19 +435,24 @@ struct GlobalInfo
   int fps_slowdown_factor;
 };
 
-extern Display	       *display;
-extern Visual	       *visual;
-extern int		screen;
+#if 0
 extern DrawWindow	window;
-extern GC		gc, clip_gc[], tile_clip_gc;
+extern GC		gc;
+#endif
+
+extern GC		clip_gc[], tile_clip_gc;
 extern Bitmap		pix[];
 extern Bitmap		pix_masked[], tile_masked[];
 extern Pixmap		clipmask[], tile_clipmask[];
 
 extern DrawBuffer	drawto, drawto_field, backbuffer, fieldbuffer;
+#if 0
 extern Colormap		cmap;
+#endif
 
+#if 0
 extern char	       *sound_device_name;
+#endif
 
 extern int		joystick_device;
 extern char	       *joystick_device_name[];
@@ -477,8 +466,11 @@ extern int		button_status;
 extern boolean		motion_status;
 extern int		key_joystick_mapping;
 extern int	    	global_joystick_status, joystick_status;
+
+#if 0
 extern boolean		fullscreen_available;
 extern boolean		fullscreen_enabled;
+#endif
 
 extern boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
@@ -514,7 +506,12 @@ extern int		SBX_Left, SBX_Right;
 extern int		SBY_Upper, SBY_Lower;
 extern int		ZX,ZY, ExitX,ExitY;
 extern int		AllPlayersGone;
-extern int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
+
+#if 0
+extern int		FrameCounter;
+#endif
+
+extern int		TimeFrames, TimePlayed, TimeLeft;
 extern boolean		SiebAktiv;
 extern int		SiebCount;
 
@@ -527,10 +524,19 @@ extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
 extern struct SampleInfo	Sound[];
 extern struct JoystickInfo	joystick[];
+
+#if 0
 extern struct OptionInfo	options;
+#endif
+
 extern struct SetupInfo		setup;
 extern struct GameInfo		game;
-extern struct SystemInfo	sysinfo;
+
+#if 0
+extern struct VideoSystemInfo	video;
+extern struct AudioSystemInfo	audio;
+#endif
+
 extern struct GlobalInfo	global;
 
 extern char		*sound_name[];
@@ -1659,6 +1665,7 @@ extern int		num_element_info;
 #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
+#define ICON_TITLE_STRING	PROGRAM_TITLE_STRING
 
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"