OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

the MISSILE(EVEN)MORE flags still need to be accessible by ZScript for backwards compatibility.

Browse source 
Since these do not exist anymore an internal interface to Handle/CheckDeprecatedFlags was added.
This commit is contained in:
Christoph Oelckers 2024-10-03 12:32:09 +02:00
commit 3798fd815f
5 changed files with 185 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/scripting/thingdef_data.cpp
View file

@ -920,6 +920,18 @@ void SynthesizeFlagFields()
{
cls->VMType->AddNativeField(FStringf("b%s", fl.Defs[i].name), (fl.Defs[i].fieldsize == 4 ? TypeSInt32 : TypeSInt16), fl.Defs[i].structoffset, fl.Defs[i].varflags, fl.Defs[i].flagbit);
}
else if (fl.Defs[i].flagbit == DEPF_MISSILEMORE || fl.Defs[i].flagbit == DEPF_MISSILEEVENMORE) // these need script side emulation because they have been around for many years.
{
auto field = cls->VMType->AddNativeField(FStringf("b%s", fl.Defs[i].name), TypeSInt32, 0, VARF_Native);
if (field)
{
// these are deprecated so flag accordingly with a proper message.
field->DeprecationMessage = "Use missilechancemult property instead";
field->mVersion = MakeVersion(4, 13, 0);
field->Flags |= VARF_Deprecated;
field->BitValue = fl.Defs[i].flagbit + 64;
}
}
}
}
}

16
src/scripting/thingdef_properties.cpp
View file

@ -361,6 +361,15 @@ void HandleDeprecatedFlags(AActor *actor, int set, int index)
}
}
// the interface here works on object, but currently all deprecated flags affect subclasses of Actor only
DEFINE_ACTION_FUNCTION_NATIVE(DObject, HandleDeprecatedFlags, HandleDeprecatedFlags)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(set);
PARAM_INT(index);
HandleDeprecatedFlags(self, set, index);
return 0;
}
//===========================================================================
//
// CheckDeprecatedFlags
@ -429,6 +438,13 @@ int CheckDeprecatedFlags(AActor *actor, int index)
return false; // Any entirely unknown flag is not set
}
DEFINE_ACTION_FUNCTION_NATIVE(DObject, CheckDeprecatedFlags, CheckDeprecatedFlags)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(index);
ACTION_RETURN_INT(CheckDeprecatedFlags(self, index));
}
//==========================================================================
//
//