diff options
author | Tim Angus <tim@ngus.net> | 2006-01-27 19:50:12 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2006-01-27 19:50:12 +0000 |
commit | dfff1857ce0517dec0c67c59eed9bab0a4d55e25 (patch) | |
tree | 10d227310c61eb1fc6e0cddbd8bb9ec847918cb6 /src/renderer | |
parent | c106cea01560ffc77938d6cb3d9239250828c8d5 (diff) |
* Merged ioq3-r529
- Quick fullscreen changes
- Fix to that server crashing memory leak
- Some FreeBSD changes
* Default for r_znear changed
Diffstat (limited to 'src/renderer')
-rw-r--r-- | src/renderer/tr_init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/renderer/tr_init.c b/src/renderer/tr_init.c index 79c910d1..4d47f46c 100644 --- a/src/renderer/tr_init.c +++ b/src/renderer/tr_init.c @@ -927,7 +927,11 @@ void R_Register( void ) r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH); r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH ); +#if USE_SDL_VIDEO + r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE ); +#else r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH ); +#endif r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH ); r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH ); r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH ); @@ -954,7 +958,7 @@ void R_Register( void ) r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT ); r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE ); r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE ); - r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT ); + r_znear = ri.Cvar_Get( "r_znear", "1", CVAR_CHEAT ); AssertCvarRange( r_znear, 0.001f, 200, qtrue ); r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE ); r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE ); |