OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed AStateProvider from native code.

Browse source 
The only place still referencing it was CallStateChain, so this has been made a static function now instead of a class method.
This commit is contained in:
Christoph Oelckers 2018-11-25 10:09:06 +01:00
commit 43d434b071
6 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/thingdef.cpp
View file

@ -324,7 +324,7 @@ static void CheckForUnsafeStates(PClassActor *obj)
if (obj->Size == citype->Size) return; // This class cannot have user variables.
test = pickupstates;
}
else return; // something else derived from AStateProvider. We do not know what this may be.
else return; // something else derived from StateProvider. We do not know what this may be.
}
for (; *test != NAME_None; test++)
@ -483,7 +483,7 @@ void LoadActors()
CheckStates(ti);
if (ti->bDecorateClass && ti->IsDescendantOf(RUNTIME_CLASS(AStateProvider)))
if (ti->bDecorateClass && ti->IsDescendantOf(NAME_StateProvider))
{
// either a DECORATE based weapon or CustomInventory.
// These are subject to relaxed rules for user variables in states.