From 55bd12c349272578992320462b40b8603fc0170a Mon Sep 17 00:00:00 2001 From: kreatordxx <> Date: Thu, 5 Apr 2007 13:23:44 +0000 Subject: [PATCH] remove final remains of VR_current_page and VR_use_paging, resolution variable cleanup - remove VGA_current_mode, VR_screen_mode, VR_render_buffer[0].cv_bitmap.bm_w/h and VR_render_width/height (Game_screen_mode is the actual resolution put in an int, not an index) --- arch/dos/gr.c | 2 -- arch/ogl/gr.c | 3 --- arch/sdl/gr.c | 3 --- dxx-changelog.txt | 4 ++++ main/game.c | 16 ++++------------ main/gameseq.c | 2 +- main/inferno.c | 2 +- main/menu.c | 12 ++++++------ main/playsave.c | 13 ++++++------- main/screens.h | 3 +-- 10 files changed, 23 insertions(+), 37 deletions(-) diff --git a/arch/dos/gr.c b/arch/dos/gr.c index 6eb7a8bf6..78b69783f 100755 --- a/arch/dos/gr.c +++ b/arch/dos/gr.c @@ -72,7 +72,6 @@ typedef struct screen_save { screen_save gr_saved_screen; int gr_show_screen_info = 0; -extern int VGA_current_mode; void gr_set_cellheight( ubyte height ) { @@ -469,7 +468,6 @@ return 0; gr_init_canvas(&grd_curscreen->sc_canvas,raw_data,BM_LINEAR,w,h); must_free_canvas = 1; } - VGA_current_mode = mode; gr_set_current_canvas(NULL); if (mode == SM(320,400)) // paging is enabled for this video mode diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index ff7b16691..69de1f955 100755 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -304,8 +304,6 @@ int gr_check_mode(u_int32_t mode) } -extern int VGA_current_mode; // DPH: kludge - remove at all costs - int gr_set_mode(u_int32_t mode) { unsigned int w, h; @@ -323,7 +321,6 @@ return 0; w=SM_W(mode); h=SM_H(mode); - VGA_current_mode = mode; //if (screen != NULL) gr_palette_clear(); diff --git a/arch/sdl/gr.c b/arch/sdl/gr.c index bf75f4c1c..51bcf48f3 100755 --- a/arch/sdl/gr.c +++ b/arch/sdl/gr.c @@ -166,8 +166,6 @@ int gr_check_mode(u_int32_t mode) } -extern int VGA_current_mode; // DPH: kludge - remove at all costs - int gr_set_mode(u_int32_t mode) { unsigned int w, h; @@ -183,7 +181,6 @@ int gr_set_mode(u_int32_t mode) w=SM_W(mode); h=SM_H(mode); - VGA_current_mode = mode; if (screen != NULL) gr_palette_clear(); diff --git a/dxx-changelog.txt b/dxx-changelog.txt index 052c4ab54..21a11bca3 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20070405 +-------- +arch/dos/gr.c, arch/ogl/gr.c, arch/sdl/gr.c, main/game.c, main/gameseq.c, main/inferno.c, main/menu.c, main/playsave.c, main/screens.h: resolution variable cleanup - remove VGA_current_mode, VR_screen_mode and VR_render_buffer[0].cv_bitmap.bm_w/h (Game_screen_mode is the actual resolution put in an int, not an index) + 20070404 -------- main/gauges.c: fixing Alt-HUD Y-Offset for Multi-Games diff --git a/main/game.c b/main/game.c index b1080ab40..7582b792b 100755 --- a/main/game.c +++ b/main/game.c @@ -117,8 +117,6 @@ char game_rcsid[] = "$Id: game.c,v 1.1.1.1 2006/03/17 19:55:53 zicodxx Exp $"; #include "hudmsg.h" #include "movie.h" -int VGA_current_mode; - #ifdef MWPROFILER #include #endif @@ -163,8 +161,6 @@ int stop_count,start_count; int time_stopped,time_started; #endif -int VR_screen_mode = 0; - ubyte VR_screen_flags = 0; //see values in screens.h fix VR_eye_width = F1_0; int VR_render_mode = VR_NONE; @@ -468,10 +464,9 @@ void game_init_render_sub_buffers( int x, int y, int w, int h ) // Sets up the canvases we will be rendering to (NORMAL VERSION) -void game_init_render_buffers(int screen_mode, int render_w, int render_h, int render_method, int flags ) +void game_init_render_buffers(int render_w, int render_h, int render_method, int flags ) { - VR_screen_mode = screen_mode; VR_screen_flags = flags; VR_reset_params(); @@ -540,16 +535,13 @@ int set_screen_mode(int sm) } #endif - // ZICO - since we use variable resolutions we can't store them in modes. Game_window_w/h is used to scale the window for STATUSBAR and shrink/grow_window so we can't use it to store the current resolution. So we store it in the VR_render variables. If we are going to remove this VR stuff we need to create new variables. - VR_screen_mode = Game_screen_mode = SM(VR_render_buffer[0].cv_bitmap.bm_w, VR_render_buffer[0].cv_bitmap.bm_h); - if (MenuHiresAvailable && FontHiresAvailable && (grd_curscreen->sc_w >= 640) && (grd_curscreen->sc_h >= 480)) { Current_display_mode = MenuHires = FontHires = 1; } else { Current_display_mode = MenuHires = FontHires = 0; } - if ( Screen_mode == sm && VGA_current_mode == VR_screen_mode) { + if ( Screen_mode == sm && grd_curscreen->sc_mode == Game_screen_mode) { gr_set_current_canvas(NULL); return 1; } @@ -582,8 +574,8 @@ int set_screen_mode(int sm) break; case SCREEN_GAME: - if (VGA_current_mode != VR_screen_mode) { - if (gr_set_mode(VR_screen_mode)) { + if (grd_curscreen->sc_mode != Game_screen_mode) { + if (gr_set_mode(Game_screen_mode)) { Error("Cannot set desired screen mode for game!"); //we probably should do something else here, like select a standard mode } diff --git a/main/gameseq.c b/main/gameseq.c index 2db872b48..380513821 100755 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -788,7 +788,7 @@ do_menu_again: Auto_leveling_on = Default_leveling_on; if (menu_use_game_res) { // ZICO - set players resolution after player is selected - gr_set_mode(SM(VR_render_buffer[0].cv_bitmap.bm_w, VR_render_buffer[0].cv_bitmap.bm_h)); + gr_set_mode(Game_screen_mode); set_screen_mode(SCREEN_GAME); } /*else set_display_mode(Default_display_mode);*/ diff --git a/main/inferno.c b/main/inferno.c index 62a657891..7ffb03b86 100755 --- a/main/inferno.c +++ b/main/inferno.c @@ -643,7 +643,7 @@ int main(int argc, char *argv[]) // added 3/24/99 by Owen Evans for screen res changing Game_screen_mode = SM(screen_width, screen_height); // end added -OE -// game_init_render_buffers(Game_screen_mode, screen_width, screen_height, VR_NONE, screen_flags); +// game_init_render_buffers(screen_width, screen_height, VR_NONE, screen_flags); } diff --git a/main/menu.c b/main/menu.c index adf80f626..0980ac86c 100755 --- a/main/menu.c +++ b/main/menu.c @@ -724,7 +724,7 @@ void set_display_mode(int mode) if (Current_display_mode != -1) { -// game_init_render_buffers(dmi->VGA_mode,dmi->w,dmi->h,dmi->render_method,dmi->flags); +// game_init_render_buffers(dmi->w,dmi->h,dmi->render_method,dmi->flags); Default_display_mode = Current_display_mode; } @@ -754,7 +754,7 @@ void do_screen_res_menu() m[3].type=NM_TYPE_RADIO; m[3].value=0; m[3].group=0; m[3].text=" 800x600"; n_items = 4; - odisplay_mode = VGA_current_mode; + odisplay_mode = Game_screen_mode; citem = Current_display_mode; if (Current_display_mode >= 2) citem--; @@ -1059,12 +1059,12 @@ void change_res() newmenu_close(); Game_screen_mode = screen_mode; - VR_render_buffer[0].cv_bitmap.bm_w = Game_window_w = screen_width; - VR_render_buffer[0].cv_bitmap.bm_h = Game_window_h = screen_height; - game_init_render_buffers(screen_mode, screen_width, screen_height, VR_NONE, 0); + Game_window_w = screen_width; + Game_window_h = screen_height; + game_init_render_buffers(screen_width, screen_height, VR_NONE, 0); if (menu_use_game_res) { - gr_set_mode(SM(VR_render_buffer[0].cv_bitmap.bm_w,VR_render_buffer[0].cv_bitmap.bm_h)); + gr_set_mode(Game_screen_mode); set_screen_mode(SCREEN_GAME); } } diff --git a/main/playsave.c b/main/playsave.c index ce3c39fc4..bfac15cf4 100755 --- a/main/playsave.c +++ b/main/playsave.c @@ -461,9 +461,9 @@ int write_player_d2x(char *filename) PHYSFSX_puts(fout, str); sprintf (str, "[resolution]\n"); PHYSFSX_puts(fout, str); - sprintf (str, "width=%i\n", VR_render_buffer[0].cv_bitmap.bm_w); + sprintf (str, "width=%i\n", SM_W(Game_screen_mode)); PHYSFSX_puts(fout, str); - sprintf (str, "height=%d\n", VR_render_buffer[0].cv_bitmap.bm_h); + sprintf (str, "height=%d\n", SM_H(Game_screen_mode)); PHYSFSX_puts(fout, str); sprintf (str, "[end]\n"); PHYSFSX_puts(fout, str); @@ -525,9 +525,9 @@ int write_player_d2x(char *filename) { sprintf (str, "[resolution]\n"); PHYSFSX_puts(fout, str); - sprintf (str, "width=%i\n", VR_render_buffer[0].cv_bitmap.bm_w); + sprintf (str, "width=%i\n", SM_W(Game_screen_mode)); PHYSFSX_puts(fout, str); - sprintf (str, "height=%d\n", VR_render_buffer[0].cv_bitmap.bm_h); + sprintf (str, "height=%d\n", SM_H(Game_screen_mode)); PHYSFSX_puts(fout, str); sprintf (str, "[end]\n"); PHYSFSX_puts(fout, str); @@ -605,9 +605,9 @@ int write_player_d2x(char *filename) { sprintf (str, "[resolution]\n"); PHYSFSX_puts(fout, str); - sprintf (str, "width=%i\n", VR_render_buffer[0].cv_bitmap.bm_w); + sprintf (str, "width=%i\n", SM_W(Game_screen_mode)); PHYSFSX_puts(fout, str); - sprintf (str, "height=%d\n", VR_render_buffer[0].cv_bitmap.bm_h); + sprintf (str, "height=%d\n", SM_H(Game_screen_mode)); PHYSFSX_puts(fout, str); sprintf (str, "[end]\n"); PHYSFSX_puts(fout, str); @@ -920,7 +920,6 @@ int read_player_file() { Game_screen_mode = SM(Player_render_width,Player_render_height); game_init_render_buffers( - SM(Player_render_width,Player_render_height), Player_render_width, Player_render_height, VR_NONE, 0); } diff --git a/main/screens.h b/main/screens.h index 0b6bf395f..cc6d850ef 100755 --- a/main/screens.h +++ b/main/screens.h @@ -55,7 +55,6 @@ extern void VR_reset_params(); extern int VR_use_reg_code; -extern int VR_screen_mode; extern int VR_render_mode; extern int VR_low_res; extern int VR_show_hud; @@ -80,7 +79,7 @@ extern grs_canvas VR_screen_sub_pages[2]; // Two sub pages of VRAM if paging is #define VR_AREA_DET 1 // viewing with the stereo area determined method #define VR_INTERLACED 2 // viewing with the stereo interlaced method -void game_init_render_buffers(int screen_mode, int render_max_w, int render_max_h, int render_method, int flags); +void game_init_render_buffers(int render_max_w, int render_max_h, int render_method, int flags); void game_init_render_sub_buffers(int x, int y, int w, int h); void set_display_mode(int mode);