X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=47c9100837c23fd051c26c47a2f7112425335a18;hb=4f767d54c7ac468e9a42e22caf716111be1ceba9;hp=be179b53be95de09c069970bd5dc4c8682e33d8b;hpb=49dab46aa55cb43233c7f9a310593f8bd8debc29;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index be179b53..47c91008 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,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;