diff options
| author | Tim Angus <tim@ngus.net> | 2015-06-08 23:08:29 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2015-06-08 23:08:29 +0100 |
| commit | b8b66865c8ff4c756fe3544decb5504dbc2abdf7 (patch) | |
| tree | 457bf7a5042c7e3a35d0df9a62c5e3a0e2702bb8 | |
| parent | d08a64c55393521f3b4c600115ea99ebaab3db40 (diff) | |
| parent | d487b1a69f8961b9d4f8658c2e2ae3c272acd2cb (diff) | |
Merge pull request #10 from jkent/master
fix initialization based on r_width and r_height
| -rw-r--r-- | src/renderergl1/tr_init.c | 4 | ||||
| -rw-r--r-- | src/renderergl2/tr_init.c | 4 | ||||
| -rw-r--r-- | src/sdl/sdl_glimp.c | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/renderergl1/tr_init.c b/src/renderergl1/tr_init.c index fbaa1c37..0a9d75b9 100644 --- a/src/renderergl1/tr_init.c +++ b/src/renderergl1/tr_init.c @@ -960,8 +960,8 @@ void R_Register( void ) r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH); r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE ); r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH); - r_width = ri.Cvar_Get( "r_width", "640", CVAR_ARCHIVE | CVAR_LATCH ); - r_height = ri.Cvar_Get( "r_height", "480", CVAR_ARCHIVE | CVAR_LATCH ); + r_width = ri.Cvar_Get( "r_width", "0", CVAR_ARCHIVE | CVAR_LATCH ); + r_height = ri.Cvar_Get( "r_height", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_pixelAspect = ri.Cvar_Get( "r_pixelAspect", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH ); diff --git a/src/renderergl2/tr_init.c b/src/renderergl2/tr_init.c index dcb37d2c..ea62249a 100644 --- a/src/renderergl2/tr_init.c +++ b/src/renderergl2/tr_init.c @@ -1098,8 +1098,8 @@ void R_Register( void ) r_mode = ri.Cvar_Get( "r_mode", "-2", CVAR_ARCHIVE | CVAR_LATCH ); r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE ); r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH); - r_width = ri.Cvar_Get( "r_width", "640", CVAR_ARCHIVE | CVAR_LATCH ); - r_height = ri.Cvar_Get( "r_height", "480", CVAR_ARCHIVE | CVAR_LATCH ); + r_width = ri.Cvar_Get( "r_width", "0", CVAR_ARCHIVE | CVAR_LATCH ); + r_height = ri.Cvar_Get( "r_height", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_pixelAspect = ri.Cvar_Get( "r_pixelAspect", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH ); diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c index 69cdb374..51b448a2 100644 --- a/src/sdl/sdl_glimp.c +++ b/src/sdl/sdl_glimp.c @@ -261,9 +261,14 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor if( !failSafe ) { - // use desktop video resolution - if( desktopMode.h > 0 ) + if( r_width->integer > 0 && r_height->integer > 0 ) { + glConfig.vidWidth = r_width->integer; + glConfig.vidHeight = r_height->integer; + } + else if( desktopMode.h > 0 ) + { + // use desktop video resolution glConfig.vidWidth = desktopMode.w; glConfig.vidHeight = desktopMode.h; } |