zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- pull fix from GZDoom - handle situations where the uniform cvar may already exist

Browse source
This commit is contained in:
Rachael Alexanderson 2022-02-01 11:45:29 -05:00
parent cc57914bbf
commit 942acc04c1
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/core/r_data/gldefs.cpp
View file

@ -1552,12 +1552,28 @@ class GLDefsParser
}
sc.MustGetString();
cvarname = sc.String;
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
cvar = FindCVar(cvarname, NULL);
if (!cvar)
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
if (!(cvar->GetFlags() & CVAR_MOD))
{
if (!((cvar->GetFlags() & (CVAR_AUTO | CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE)))
sc.ScriptError("CVAR '%s' already in use!", cvarname);
}
UCVarValue val;
sc.MustGetNumber();
val.Float = sc.Number;
// 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)))
{
val = cvar->GetGenericRep(CVAR_Float);
delete cvar;
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
}
shaderdesc.Uniforms[uniformName].Values[0] = sc.Number;
cvar->SetGenericRepDefault(val, CVAR_Float);