zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-25 13:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for Morph virtual

Browse source 
Allows class<MorphedMonster> to be used as an argument type in place of class<Actor> within the third argument for backwards compatibility.
This commit is contained in:
Boondorl 2024-03-08 13:54:02 -05:00 committed by Rachael Alexanderson
parent 5ed4f477ed
commit 06eee55671
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/objects/dobjtype.cpp
View file

@ -667,6 +667,8 @@ PClass *PClass::FindClassTentative(FName name)
// //
//========================================================================== //==========================================================================
bool ShouldAllowGameSpecificVirtual(FName name, unsigned index, PType* arg, PType* varg);
int PClass::FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction *parentfunc, bool exactReturnType, bool ignorePointerReadOnly) int PClass::FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction *parentfunc, bool exactReturnType, bool ignorePointerReadOnly)
{ {
auto proto = variant->Proto; auto proto = variant->Proto;
@ -698,7 +700,7 @@ int PClass::FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction
break; break;
} }
} }
else else if(!ShouldAllowGameSpecificVirtual(name, a, proto->ArgumentTypes[a], vproto->ArgumentTypes[a]))
{ {
fail = true; fail = true;
break; break;

1
src/namedef_custom.h
View file

@ -462,6 +462,7 @@ xx(WBobSpeed)
xx(WBobFire) xx(WBobFire)
xx(PlayerClass) xx(PlayerClass)
xx(MonsterClass) xx(MonsterClass)
xx(Morph)
xx(MorphedMonster) xx(MorphedMonster)
xx(Wi_NoAutostartMap) xx(Wi_NoAutostartMap)

13
src/scripting/backend/codegen_doom.cpp
View file

@ -57,6 +57,19 @@ PFunction* FindBuiltinFunction(FName funcname);
// //
//========================================================================== //==========================================================================
bool ShouldAllowGameSpecificVirtual(FName name, unsigned index, PType* arg, PType* varg)
{
return (name == NAME_Morph && index == 3u && arg->isClassPointer() && varg->isClassPointer()
&& PType::toClassPointer(varg)->ClassRestriction->TypeName == NAME_Actor
&& PType::toClassPointer(arg)->ClassRestriction->TypeName == NAME_MorphedMonster);
}
//==========================================================================
//
//
//
//==========================================================================
bool isActor(PContainerType *type) bool isActor(PContainerType *type)
{ {
auto cls = PType::toClass(type); auto cls = PType::toClass(type);