OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved Restricted/ForbiddenToPlayerClass fully to the script side.

Browse source 
This required some fixes for allowing to read from metadata arrays.
This commit is contained in:
Christoph Oelckers 2017-04-11 15:11:13 +02:00
commit 6a3ddaa8fa
7 changed files with 49 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/scripting/thingdef_properties.cpp
View file

@ -1090,12 +1090,14 @@ DEFINE_PROPERTY(distancecheck, S, Actor)
//==========================================================================
DEFINE_CLASS_PROPERTY(restrictedto, Ssssssssssssssssssss, Inventory)
{
static_cast<PClassActor*>(info)->RestrictedToPlayerClass.Clear();
auto restrictarray = (TArray<PClassActor*>*)defaults->ScriptVar(NAME_RestrictedToPlayerClass, nullptr);
restrictarray->Clear();
for(int i = 0;i < PROP_PARM_COUNT;++i)
{
PROP_STRING_PARM(n, i);
if (*n != 0)
static_cast<PClassActor*>(info)->RestrictedToPlayerClass.Push(FindClassTentative(n, RUNTIME_CLASS(APlayerPawn)));
restrictarray->Push(FindClassTentative(n, RUNTIME_CLASS(APlayerPawn)));
}
}
@ -1104,12 +1106,14 @@ DEFINE_CLASS_PROPERTY(restrictedto, Ssssssssssssssssssss, Inventory)
//==========================================================================
DEFINE_CLASS_PROPERTY(forbiddento, Ssssssssssssssssssss, Inventory)
{
static_cast<PClassActor*>(info)->ForbiddenToPlayerClass.Clear();
auto forbidarray = (TArray<PClassActor*>*)defaults->ScriptVar(NAME_ForbiddenToPlayerClass, nullptr);
forbidarray->Clear();
for(int i = 0;i < PROP_PARM_COUNT;++i)
{
PROP_STRING_PARM(n, i);
if (*n != 0)
static_cast<PClassActor*>(info)->ForbiddenToPlayerClass.Push(FindClassTentative(n, RUNTIME_CLASS(APlayerPawn)));
forbidarray->Push(FindClassTentative(n, RUNTIME_CLASS(APlayerPawn)));
}
}