From 88f986afe596f594ed981072810a1887117ab1bb Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Sun, 15 Jul 2007 21:55:00 +0000 Subject: [PATCH] Fixing duplicated gr_toggle_fullscreen() --- CHANGELOG.txt | 1 + d2x.ini | 4 ++-- main/game.c | 8 -------- main/inferno.c | 18 +++++++++--------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7ae03124d..7e4177689 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D2X-Rebirth Changelog 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 +main/game.c: Fixing duplicated gr_toggle_fullscreen() 20070715 -------- diff --git a/d2x.ini b/d2x.ini index 8da0d09f1..4dc7dfdbe 100755 --- a/d2x.ini +++ b/d2x.ini @@ -32,10 +32,10 @@ ;-menux Set menu-resolution to by instead of game-resolution ;-aspectx use specified aspect ;-hud 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 ;-lowresmovies Play low resolution movies if available (for slow machines) -;-subtitles Turn on movie subtitles (English-only) +;-subtitles Turn on movie subtitles OpenGL: diff --git a/main/game.c b/main/game.c index e01f9abf4..a333e87f9 100755 --- a/main/game.c +++ b/main/game.c @@ -583,14 +583,6 @@ int set_screen_mode(int sm) 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; void stop_time() diff --git a/main/inferno.c b/main/inferno.c index aae706475..1984b4ddc 100755 --- a/main/inferno.c +++ b/main/inferno.c @@ -197,9 +197,9 @@ void print_commandline_help() printf( " -menux %s\n", "Set menu-resolution to by instead of game-resolution"); printf( " -aspectx %s\n", "use specified aspect"); printf( " -hud %s\n", "Set hud mode. 0=normal 1-3=new"); - printf( " -persistentdebris %s\n", "Enable persistent debris"); - printf( " -lowresmovies %s\n","Play low resolution movies if available (for slow machines)"); - printf( " -subtitles %s\n","Turn on movie subtitles (English-only)"); + 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( " -subtitles %s\n", "Turn on movie subtitles"); #ifdef OGL printf( "\n OpenGL:\n\n"); @@ -227,15 +227,15 @@ void print_commandline_help() #ifndef NDEBUG 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( " -renderstats %s\n", "Enable renderstats info by default"); - printf( " -norun %s\n","Bail out after initialization"); - printf( " -nofade %s\n","Disable fades"); - printf( " -norun %s\n","Bail out after initialization"); - printf( " -text %s\n","Specify alternate .tex file"); + printf( " -norun %s\n", "Bail out after initialization"); + printf( " -nofade %s\n", "Disable fades"); + printf( " -norun %s\n", "Bail out after initialization"); + printf( " -text %s\n", "Specify alternate .tex file"); #ifndef RELEASE - printf( " -nomovies %s\n","Don't play movies"); + printf( " -nomovies %s\n", "Don't play movies"); #endif // RELEASE #ifdef SDL_VIDEO printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch");