zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-13 07:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- another fix

Browse source
This commit is contained in:
Rachael Alexanderson 2022-02-09 07:20:34 -05:00
parent 1b9148a443
commit 084c4f84bd
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/r_data/gldefs.cpp
View file

@ -1557,6 +1557,7 @@ class GLDefsParser
UCVarValue oldval; UCVarValue oldval;
UCVarValue val; UCVarValue val;
ExtraUniformCVARData* oldextra = nullptr;
sc.MustGetFloat(); sc.MustGetFloat();
val.Float = oldval.Float = sc.Float; val.Float = oldval.Float = sc.Float;
@ -1569,6 +1570,7 @@ class GLDefsParser
{ {
// this value may have been previously loaded // this value may have been previously loaded
oldval.Float = cvar->GetGenericRep(CVAR_Float).Float; oldval.Float = cvar->GetGenericRep(CVAR_Float).Float;
oldextra = (ExtraUniformCVARData*)cvar->GetExtraDataPointer();
} }
if (!(cvar->GetFlags() & CVAR_MOD)) if (!(cvar->GetFlags() & CVAR_MOD))
@ -1576,9 +1578,6 @@ class GLDefsParser
if (!((cvar->GetFlags() & (CVAR_AUTO | CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE))) if (!((cvar->GetFlags() & (CVAR_AUTO | CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE)))
sc.ScriptError("CVAR '%s' already in use!", cvarname.GetChars()); sc.ScriptError("CVAR '%s' already in use!", cvarname.GetChars());
} }
ExtraUniformCVARData* oldextra = nullptr;
// must've picked this up from an autoexec.cfg, handle accordingly // must've picked this up from an autoexec.cfg, handle accordingly
if (cvar && ((cvar->GetFlags() & (CVAR_MOD|CVAR_AUTO|CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE))) if (cvar && ((cvar->GetFlags() & (CVAR_MOD|CVAR_AUTO|CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE)))