TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

set MENU_SCREEN_MODE at init to set movie according to -menu parameter and also prevent unnecessary screen changes

Browse source
This commit is contained in:
zicodxx 2007-02-09 12:38:21 +00:00
parent a8d491f130
commit 7c9f8bf7fe
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/ogl/gr.c
View file

@ -449,9 +449,9 @@ int ogl_init_load_library(void)
}
#endif
int gr_init()
int gr_init(int mode)
{
int mode = SM(640,480);
// int mode = SM(640,480);
int retcode, t, glt = 0;
// Only do this function once!

8
arch/sdl/gr.c
View file

@ -251,7 +251,7 @@ int gr_toggle_fullscreen(void){
return (sdl_video_flags & SDL_FULLSCREEN)?1:0;
}
int gr_init(void)
int gr_init(int mode)
{
// Only do this function once!
if (gr_installed==1)
@ -274,6 +274,12 @@ int gr_init(void)
sdl_video_flags|=SDL_HWSURFACE;
//end addition -MM
// Set the mode.
if ((retcode=gr_set_mode(mode)))
{
return retcode;
}
grd_curscreen->sc_canvas.cv_color = 0;
grd_curscreen->sc_canvas.cv_drawmode = 0;
grd_curscreen->sc_canvas.cv_font = NULL;

4
dxx-changelog.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20070209
--------
arch/ogl/gr.c, arch/sdl/gr.c, include/gr.h, main/inferno.c: set MENU_SCREEN_MODE at init to set movie according to -menu parameter and also prevent unnecessary screen changes
20070208
--------
main/newdemo.c: fixed demo playback Afterburner gauge and Primary weapon ammo info

2
include/gr.h
View file

@ -195,7 +195,7 @@ typedef struct _grs_screen { // This is a video screen
// grd_curscreen to point to it. grs_curcanv points to this screen's
// canvas. Saves the current VGA state and screen mode.
int gr_init(void);
int gr_init(int mode);
// This function sets up the main screen. It should be called whenever
// the video mode changes.

4
main/inferno.c
View file

@ -669,9 +669,11 @@ int main(int argc, char *argv[])
if (FindArg( "-lowresmovies" ))
MovieHires = 0;
if ((t=gr_init())!=0) //doesn't do much
if ((t=gr_init(0))!=0) //doesn't do much
Error(TXT_CANT_INIT_GFX,t);
gr_set_mode(MENU_SCREEN_MODE);
// Load the palette stuff. Returns non-zero if error.
con_printf(CON_DEBUG, "Initializing palette system...\n" );
gr_use_palette_table(DEFAULT_PALETTE );