rnd-20001203-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 49fde3e9941378ca31fcbe7c6535d5edf1bfb3f8..5547d8224a959d4357a1eefed1afd287fb21dd51 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -11,31 +11,50 @@
 *  main.c                                                  *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "main.h"
 #include "init.h"
 #include "game.h"
 #include "events.h"
-#include "sound.h"
 #include "joystick.h"
-#include "misc.h"
 
 #if defined(PLATFORM_MSDOS)
 #include <fcntl.h>
 #endif
 
-Display        *display;
-Visual        *visual;
-int            screen;
+#if 0
 DrawWindow     window = None;
-GC             gc, clip_gc[NUM_BITMAPS], tile_clip_gc;
+DrawBuffer     backbuffer;
+GC             gc;
+#endif
+
+#if 0
+GC             clip_gc[NUM_BITMAPS];
+#endif
+GC             tile_clip_gc;
 Bitmap         pix[NUM_BITMAPS];
-Bitmap         pix_masked[NUM_BITMAPS], tile_masked[NUM_TILES];
-Pixmap         clipmask[NUM_BITMAPS], tile_clipmask[NUM_TILES];
+#if 0
+Bitmap         pix_masked[NUM_BITMAPS];
+#endif
+Bitmap         tile_masked[NUM_TILES];
+#if 0
+Pixmap         clipmask[NUM_BITMAPS];
+#endif
+Pixmap         tile_clipmask[NUM_TILES];
 
-DrawBuffer     drawto, drawto_field, backbuffer, fieldbuffer;
+#if 0
+DrawBuffer     drawto;
+#endif
+
+DrawBuffer     drawto_field, fieldbuffer;
+#if 0
 Colormap       cmap;
+#endif
 
-char          *sound_device_name = SOUND_DEVICE;
+#if 0
+char          *sound_device_name = AUDIO_DEVICE;
+#endif
 
 int            joystick_device = 0;
 char          *joystick_device_name[MAX_PLAYERS] =
@@ -56,13 +75,19 @@ boolean             motion_status = FALSE;
 int            key_joystick_mapping = 0;
 int            global_joystick_status = JOYSTICK_STATUS;
 int            joystick_status = JOYSTICK_STATUS;
+
+#if 0
 boolean                fullscreen_available = FULLSCREEN_STATUS;
 boolean                fullscreen_enabled = FALSE;
+#endif
 
 boolean                redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int            redraw_x1 = 0, redraw_y1 = 0;
+
+#if 0
 int            redraw_mask;
 int            redraw_tiles;
+#endif
 
 short          Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short          Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -94,7 +119,12 @@ int         SBX_Left, SBX_Right;
 int            SBY_Upper, SBY_Lower;
 int            ZX,ZY, ExitX,ExitY;
 int            AllPlayersGone;
-int            FrameCounter, TimeFrames, TimePlayed, TimeLeft;
+
+#if 0
+int            FrameCounter;
+#endif
+
+int            TimeFrames, TimePlayed, TimeLeft;
 
 boolean                network_player_action_received = FALSE;
 
@@ -104,10 +134,19 @@ struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore         highscore[MAX_SCORE_ENTRIES];
 struct SampleInfo      Sound[NUM_SOUNDS];
 struct TapeInfo                tape;
+
+#if 0
 struct OptionInfo      options;
+#endif
+
 struct SetupInfo       setup;
 struct GameInfo                game;
-struct SystemInfo      sysinfo;
+
+#if 0
+struct VideoSystemInfo video;
+struct AudioSystemInfo audio;
+#endif
+
 struct GlobalInfo      global;
 
 /* data needed for playing sounds */