rnd-19981123-2

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index be179b53be95de09c069970bd5dc4c8682e33d8b..47c9100837c23fd051c26c47a2f7112425335a18 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,9 @@ 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                network_playing = FALSE;
 int            button_status = MB_NOT_PRESSED;
 boolean                motion_status = FALSE;