OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the unused palette parameter from the V_GetColor family of functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-14 09:56:27 +02:00
commit 109069f718
24 changed files with 53 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/decorate/thingdef_parse.cpp
View file

@ -190,7 +190,7 @@ FxExpression *ParseParameter(FScanner &sc, PClassActor *cls, PType *type)
}
else
{
int c = V_GetColor (NULL, sc);
int c = V_GetColor (sc);
// 0 needs to be the default so we have to mark the color.
v = MAKEARGB(1, RPART(c), GPART(c), BPART(c));
}
@ -884,7 +884,7 @@ static void DispatchScriptProperty(FScanner &sc, PProperty *prop, AActor *defaul
else if (f->Type == TypeColor)
{
if (sc.CheckNumber()) *(int*)addr = sc.Number;
else *(PalEntry*)addr = V_GetColor(nullptr, sc);
else *(PalEntry*)addr = V_GetColor(sc);
}
else if (f->Type->isIntCompatible())
{

2
src/scripting/thingdef.h
View file

@ -326,6 +326,6 @@ int MatchString (const char *in, const char **strings);
double var = params[(no)+1].d;
#define PROP_COLOR_PARM(var, no, scriptpos) \
int var = params[(no)+1].i== 0? params[(no)+2].i : V_GetColor(NULL, params[(no)+2].s, scriptpos);
int var = params[(no)+1].i== 0? params[(no)+2].i : V_GetColor(params[(no)+2].s, scriptpos);
#endif

2
src/scripting/thingdef_properties.cpp
View file

@ -1291,7 +1291,7 @@ DEFINE_CLASS_PROPERTY_PREFIX(powerup, color, C_f, Inventory)
*pBlendColor = MakeSpecialColormap(65535);
return;
}
color = V_GetColor(NULL, name, &bag.ScriptPosition);
color = V_GetColor(name, &bag.ScriptPosition);
}
if (PROP_PARM_COUNT > 2)
{

2
src/scripting/zscript/zcc_compile_doom.cpp
View file

@ -471,7 +471,7 @@ void ZCCDoomCompiler::DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *
}
else if (f->Type == TypeColor && ex->ValueType == TypeString) // colors can also be specified as ints.
{
*(PalEntry*)addr = V_GetColor(nullptr, GetStringConst(ex, ctx), &ex->ScriptPosition);
*(PalEntry*)addr = V_GetColor(GetStringConst(ex, ctx), &ex->ScriptPosition);
}
else if (f->Type->isIntCompatible())
{