From a0f6772db1e3d0b630e5d4e0edb05f0549b56a59 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 1 Feb 2015 21:37:39 -0800 Subject: [PATCH] remove d1x-ism Game_screen_mode, which basically duplicates Current_display_mode --- main/game.c | 3 --- main/game.h | 4 ---- main/inferno.c | 6 ++---- main/menu.c | 2 +- main/screens.h | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/main/game.c b/main/game.c index f0288f33..46cc682e 100644 --- a/main/game.c +++ b/main/game.c @@ -416,9 +416,6 @@ void game_show_warning(char *s) #define cv_w cv_bitmap.bm_w #define cv_h cv_bitmap.bm_h -//added 3/24/99 by Owen Evans for screen res changing -uint32_t Game_screen_mode = 0; -//end added - OE int Game_window_x = 0; int Game_window_y = 0; cvar_t Game_window_w = { "GameWidth", "0", 1 }; diff --git a/main/game.h b/main/game.h index 2aaa8ae3..59871211 100644 --- a/main/game.h +++ b/main/game.h @@ -89,10 +89,6 @@ extern int ft_preference; #define NUM_DETAIL_LEVELS 6 extern int Game_mode; -//added 3/24/99 by Owen Evans -extern uint32_t Game_screen_mode; -//end added - OE - extern int Game_paused; extern int gauge_message_on; diff --git a/main/inferno.c b/main/inferno.c index 387961dc..d3602957 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -558,10 +558,8 @@ int main(int argc, char *argv[]) FindResArg("", &screen_width, &screen_height); - if (screen_width && screen_height) { - Game_screen_mode = SM(screen_width, screen_height); - set_display_mode(Game_screen_mode); - } + if (screen_width && screen_height) + set_display_mode(SM(screen_width, screen_height)); } { // added/edited on 12/14/98 by Matt Mueller - override res in d1x.ini with command line args diff --git a/main/menu.c b/main/menu.c index c21274a0..7d335040 100644 --- a/main/menu.c +++ b/main/menu.c @@ -784,7 +784,7 @@ void do_screen_res_menu() #ifdef VID_SUPPORTS_FULLSCREEN_TOGGLE if (m[fullscreenc].value != vid_check_fullscreen()) { vid_toggle_fullscreen(); - Game_screen_mode = -1; + Current_display_mode = -1; } #endif diff --git a/main/screens.h b/main/screens.h index b95f5604..88f99a45 100644 --- a/main/screens.h +++ b/main/screens.h @@ -38,7 +38,7 @@ extern grs_canvas *Canv_editor_game; // the game window on the editor screen extern int set_screen_mode(int sm); // True = editor screen extern cvar_t menu_use_game_res; -#define MENU_SCREEN_MODE (menu_use_game_res.intval?Game_screen_mode:(MenuHires?SM(640,480):SM(320,200))) +#define MENU_SCREEN_MODE (menu_use_game_res.intval?Current_display_mode:(MenuHires?SM(640,480):SM(320,200))) //About the screen extern ubyte VR_screen_flags; -- 2.39.2