rnd-19981221-1

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index be179b53be95de09c069970bd5dc4c8682e33d8b..1ee567d06c6e28209ffadd249d531b28f068b0f0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@ GC            gc, clip_gc[NUM_PIXMAPS], tile_clip_gc;
 Pixmap         pix[NUM_PIXMAPS];
 Pixmap         clipmask[NUM_PIXMAPS], tile_clipmask[NUM_TILES];
 
-#ifdef XPM_INCLUDE_FILE
+#ifdef USE_XPM_LIBRARY
 XpmAttributes  xpm_att[NUM_PICTURES];
 #endif
 
@@ -50,12 +50,10 @@ char               *joystick_device_name[MAX_PLAYERS] =
   DEV_JOYSTICK_3
 };
 
-int            width, height;
-
 char          *program_name = NULL;
 
 int            game_status = MAINMENU;
-int            game_emulation = EMU_NONE;
+boolean                level_editor_test_game = FALSE;
 boolean                network_playing = FALSE;
 int            button_status = MB_NOT_PRESSED;
 boolean                motion_status = FALSE;
@@ -98,17 +96,16 @@ int         BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
 int            ZX,ZY, ExitX,ExitY;
 int            AllPlayersGone;
 int            FrameCounter, TimeFrames, TimeLeft;
-int            MampferNr, SiebAktiv;
+int            MampferMax, MampferNr, SiebAktiv;
 
 boolean                network_player_action_received = FALSE;
-int            TestPlayer = 0;
 
 struct LevelDirInfo    leveldir[MAX_LEVDIR_ENTRIES];
 struct LevelInfo       level;
 struct PlayerInfo      stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore         highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo       Sound[NUM_SOUNDS];
-struct RecordingInfo   tape;
+struct TapeInfo                tape;
 struct OptionInfo      options;
 struct SetupInfo       setup;
 struct SetupFileList   *setup_list = NULL;