X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=462be9b4d47d6d107af0bb02df499b37e530ef9f;hb=7600b7d74df219d2a0956e03cea3af49226903c2;hp=8cd26a117ba0cbb635ae8b05af7d80785d7e0054;hpb=2357c391b4a587709627cc30316734b3c83c8134;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 8cd26a11..462be9b4 100644
--- 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,13 +50,9 @@ char	       *joystick_device_name[MAX_PLAYERS] =
   DEV_JOYSTICK_3
 };
 
-char	       *level_directory = LEVEL_PATH;
-int     	width, height;
-
 char	       *program_name = NULL;
 
 int		game_status = MAINMENU;
-int		game_emulation = EMU_NONE;
 boolean		network_playing = FALSE;
 int		button_status = MB_NOT_PRESSED;
 boolean		motion_status = FALSE;
@@ -109,7 +105,7 @@ 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;