mirror of
https://git.code.sf.net/p/quake/nuq
synced 2025-03-13 06:12:25 +00:00
merge in bug fixes from HEAD into model_merge in preparation for merging the
other way.
This commit is contained in:
commit
11a8d450c7
2 changed files with 4 additions and 1 deletions
|
@ -406,7 +406,7 @@ void Draw_Init (void)
|
|||
int i;
|
||||
|
||||
// LordHavoc: lighting mode
|
||||
gl_lightmode = Cvar_Get("gl_lightmode", "1", CVAR_ARCHIVE,
|
||||
gl_lightmode = Cvar_Get("gl_lightmode", "0", CVAR_ARCHIVE,
|
||||
"Lighting mode (0 = GLQuake style, 1 = new style)");
|
||||
brightness = Cvar_Get("brightness", "1", CVAR_ARCHIVE,
|
||||
"Brightness");
|
||||
|
|
|
@ -225,6 +225,9 @@ void S_Init (void)
|
|||
|
||||
S_Startup ();
|
||||
|
||||
if (sound_started == 0) // sound startup failed? Bail out.
|
||||
return;
|
||||
|
||||
SND_InitScaletable ();
|
||||
|
||||
known_sfx = Hunk_AllocName (MAX_SFX*sizeof(sfx_t), "sfx_t");
|
||||
|
|
Loading…
Reference in a new issue