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

Merge branch 'master' into texture_rework

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-19 21:15:28 +02:00
commit 5d49faf190
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/scripting/vmthunks_actors.cpp
View file

@ -1614,6 +1614,22 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, Substitute, StaticPointerSubstitution)
return 0; return 0;
} }
DEFINE_ACTION_FUNCTION_NATIVE(_PlayerPawn, Substitute, StaticPointerSubstitution)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_OBJECT(replace, AActor);
StaticPointerSubstitution(self, replace);
return 0;
}
DEFINE_ACTION_FUNCTION_NATIVE(_MorphedMonster, Substitute, StaticPointerSubstitution)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_OBJECT(replace, AActor);
StaticPointerSubstitution(self, replace);
return 0;
}
DEFINE_ACTION_FUNCTION_NATIVE(AActor, GetSpawnableType, P_GetSpawnableType) DEFINE_ACTION_FUNCTION_NATIVE(AActor, GetSpawnableType, P_GetSpawnableType)
{ {
PARAM_PROLOGUE; PARAM_PROLOGUE;

2
wadsrc/static/zscript/actors/actor.zs
View file

@ -459,7 +459,7 @@ class Actor : Thinker native
virtual native void Die(Actor source, Actor inflictor, int dmgflags = 0, Name MeansOfDeath = 'none'); virtual native void Die(Actor source, Actor inflictor, int dmgflags = 0, Name MeansOfDeath = 'none');
virtual native bool Slam(Actor victim); virtual native bool Slam(Actor victim);
virtual native void Touch(Actor toucher); virtual native void Touch(Actor toucher);
native void Substitute(Actor replacement); private native void Substitute(Actor replacement);
native ui void DisplayNameTag(); native ui void DisplayNameTag();
// Called by inventory items to see if this actor is capable of touching them. // Called by inventory items to see if this actor is capable of touching them.

4
wadsrc/static/zscript/actors/player/player_morph.zs
View file

@ -1,5 +1,7 @@
extend class PlayerPawn extend class PlayerPawn
{ {
private native void Substitute(PlayerPawn replacement);
//=========================================================================== //===========================================================================
// //
// EndAllPowerupEffects // EndAllPowerupEffects
@ -503,6 +505,8 @@ class MorphedMonster : Actor
+FLOORCLIP +FLOORCLIP
} }
private native void Substitute(Actor replacement);
override void OnDestroy () override void OnDestroy ()
{ {
if (UnmorphedMe != NULL) if (UnmorphedMe != NULL)