zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: A_SetInventory still had default initializers.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-14 15:48:34 +01:00
parent 85ff172ee3
commit ba62a86c80
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_actionfunctions.cpp
View file

@ -2464,8 +2464,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetInventory)
PARAM_SELF_PROLOGUE(AActor);
PARAM_CLASS(itemtype, AInventory);
PARAM_INT(amount);
PARAM_INT_DEF(ptr) { ptr = AAPTR_DEFAULT; }
PARAM_BOOL_DEF(beyondMax) { beyondMax = false; }
PARAM_INT_DEF(ptr);
PARAM_BOOL_DEF(beyondMax);
bool res = false;

2
src/scripting/codegeneration/codegen.cpp
View file

@ -8299,7 +8299,7 @@ FxExpression *FxMultiNameState::Resolve(FCompileContext &ctx)
delete this;
return nullptr;
}
else if (!scope->IsAncestorOf(ctx.Class) && ctx.Class != RUNTIME_CLASS(AActor)) // AActor needs access to subclasses in a few places. TBD: Relax this for non-action functions?
else if (!scope->IsAncestorOf(ctx.Class))
{
ScriptPosition.Message(MSG_ERROR, "'%s' is not an ancestor of '%s'", names[0].GetChars(), ctx.Class->TypeName.GetChars());
delete this;