Fixing duplicated gr_toggle_fullscreen()
This commit is contained in:
parent
29ef28bef3
commit
88f986afe5
|
@ -3,6 +3,7 @@ D2X-Rebirth Changelog
|
||||||
20070716
|
20070716
|
||||||
--------
|
--------
|
||||||
d2x.ini, arch/ogl/gr.c, arch/ogl/ogl.c, arch/ogl/include/internal.h, arch/sdl/gr.c, include/args.h, include/gr.h, include/ogl_init.h, main/automap.c, main/game.c, main/game.h, main/gamecntl.c, main/gamefont.c, main/gauges.c, main/inferno.c, main/menu.c, main/movie.c, main/newmenu.c, main/titles.c, misc/args.c: Cleaned up more FindArg's - (most important) OpenGL Options
|
d2x.ini, arch/ogl/gr.c, arch/ogl/ogl.c, arch/ogl/include/internal.h, arch/sdl/gr.c, include/args.h, include/gr.h, include/ogl_init.h, main/automap.c, main/game.c, main/game.h, main/gamecntl.c, main/gamefont.c, main/gauges.c, main/inferno.c, main/menu.c, main/movie.c, main/newmenu.c, main/titles.c, misc/args.c: Cleaned up more FindArg's - (most important) OpenGL Options
|
||||||
|
main/game.c: Fixing duplicated gr_toggle_fullscreen()
|
||||||
|
|
||||||
20070715
|
20070715
|
||||||
--------
|
--------
|
||||||
|
|
4
d2x.ini
4
d2x.ini
|
@ -32,10 +32,10 @@
|
||||||
;-menu<X>x<Y> Set menu-resolution to <X> by <Y> instead of game-resolution
|
;-menu<X>x<Y> Set menu-resolution to <X> by <Y> instead of game-resolution
|
||||||
;-aspect<Y>x<X> use specified aspect
|
;-aspect<Y>x<X> use specified aspect
|
||||||
;-hud <n> Set hud mode. 0=normal 1-3=new
|
;-hud <n> Set hud mode. 0=normal 1-3=new
|
||||||
;-persistentdebris Enable persistent debris
|
;-persistentdebris Enable persistent debris. Works in singleplayer only
|
||||||
;-window Run the game in a window
|
;-window Run the game in a window
|
||||||
;-lowresmovies Play low resolution movies if available (for slow machines)
|
;-lowresmovies Play low resolution movies if available (for slow machines)
|
||||||
;-subtitles Turn on movie subtitles (English-only)
|
;-subtitles Turn on movie subtitles
|
||||||
|
|
||||||
OpenGL:
|
OpenGL:
|
||||||
|
|
||||||
|
|
|
@ -583,14 +583,6 @@ int set_screen_mode(int sm)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int gr_toggle_fullscreen(void){
|
|
||||||
int i;
|
|
||||||
hud_message(MSGC_GAME_FEEDBACK, "toggling fullscreen mode %s",(i=gr_toggle_fullscreen())?"on":"off" );
|
|
||||||
key_flush();
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int timer_paused=0;
|
static int timer_paused=0;
|
||||||
|
|
||||||
void stop_time()
|
void stop_time()
|
||||||
|
|
|
@ -197,9 +197,9 @@ void print_commandline_help()
|
||||||
printf( " -menu<X>x<Y> %s\n", "Set menu-resolution to <X> by <Y> instead of game-resolution");
|
printf( " -menu<X>x<Y> %s\n", "Set menu-resolution to <X> by <Y> instead of game-resolution");
|
||||||
printf( " -aspect<Y>x<X> %s\n", "use specified aspect");
|
printf( " -aspect<Y>x<X> %s\n", "use specified aspect");
|
||||||
printf( " -hud <n> %s\n", "Set hud mode. 0=normal 1-3=new");
|
printf( " -hud <n> %s\n", "Set hud mode. 0=normal 1-3=new");
|
||||||
printf( " -persistentdebris %s\n", "Enable persistent debris");
|
printf( " -persistentdebris %s\n", "Enable persistent debris. Works in singleplayer only");
|
||||||
printf( " -lowresmovies %s\n","Play low resolution movies if available (for slow machines)");
|
printf( " -lowresmovies %s\n", "Play low resolution movies if available (for slow machines)");
|
||||||
printf( " -subtitles %s\n","Turn on movie subtitles (English-only)");
|
printf( " -subtitles %s\n", "Turn on movie subtitles");
|
||||||
|
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
printf( "\n OpenGL:\n\n");
|
printf( "\n OpenGL:\n\n");
|
||||||
|
@ -227,15 +227,15 @@ void print_commandline_help()
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
printf( "\n Debug:\n\n");
|
printf( "\n Debug:\n\n");
|
||||||
printf( " -debug %s\n","Enable very verbose output");
|
printf( " -debug %s\n", "Enable very verbose output");
|
||||||
printf( " -Verbose %s\n", "Shows initialization steps for tech support");
|
printf( " -Verbose %s\n", "Shows initialization steps for tech support");
|
||||||
printf( " -renderstats %s\n", "Enable renderstats info by default");
|
printf( " -renderstats %s\n", "Enable renderstats info by default");
|
||||||
printf( " -norun %s\n","Bail out after initialization");
|
printf( " -norun %s\n", "Bail out after initialization");
|
||||||
printf( " -nofade %s\n","Disable fades");
|
printf( " -nofade %s\n", "Disable fades");
|
||||||
printf( " -norun %s\n","Bail out after initialization");
|
printf( " -norun %s\n", "Bail out after initialization");
|
||||||
printf( " -text <file> %s\n","Specify alternate .tex file");
|
printf( " -text <file> %s\n", "Specify alternate .tex file");
|
||||||
#ifndef RELEASE
|
#ifndef RELEASE
|
||||||
printf( " -nomovies %s\n","Don't play movies");
|
printf( " -nomovies %s\n", "Don't play movies");
|
||||||
#endif // RELEASE
|
#endif // RELEASE
|
||||||
#ifdef SDL_VIDEO
|
#ifdef SDL_VIDEO
|
||||||
printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch");
|
printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch");
|
||||||
|
|
Loading…
Reference in a new issue