zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed Pre/Post(Un)Morph to take the other actor and a boolean indicating direction. 

- 'current' is true for the actor that is the new body, false for the old body.
This commit is contained in:
Major Cooke 2020-03-08 09:19:20 -05:00 committed by Christoph Oelckers
parent 33b343ef31
commit 70f9b649aa
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wadsrc/static/zscript/actors/morph.zs
View File

@ -28,12 +28,11 @@ extend class Actor
return null, 0, 0;
}
// [MC] Called when an actor morphs, on both the previous form (passive) and present form (!passive).
// 'cls' points to the other class they transitioned from/to.
virtual void PreMorph(Class<Actor> cls) {}
virtual void PostMorph(Class<Actor> cls) {}
virtual void PreUnmorph(Class<Actor> cls) {}
virtual void PostUnmorph(Class<Actor> cls) {}
// [MC] Called when an actor morphs, on both the previous form (!current) and present form (current).
virtual void PreMorph(Actor mo, bool current) {}
virtual void PostMorph(Actor mo, bool current) {}
virtual void PreUnmorph(Actor mo, bool current) {}
virtual void PostUnmorph(Actor mo, bool current) {}
//===========================================================================
//
@ -112,9 +111,9 @@ extend class Actor
let morphed = MorphedMonster(Spawn (spawntype, Pos, NO_REPLACE));
// Use GetClass in the event someone actually allows replacements.
PreMorph(morphed.GetClass());
morphed.PreMorph(GetClass());
// [MC] Notify that we're just about to start the transfer.
PreMorph(morphed, false); // False: No longer the current.
morphed.PreMorph(self, true); // True: Becoming this actor.
Substitute (morphed);
if ((style & MRF_TRANSFERTRANSLATION) && !morphed.bDontTranslate)
@ -151,8 +150,8 @@ extend class Actor
let eflash = Spawn(enter_flash ? enter_flash : (class<Actor>)("TeleportFog"), Pos + (0, 0, gameinfo.TELEFOGHEIGHT), ALLOW_REPLACE);
if (eflash)
eflash.target = morphed;
PostMorph(morphed.GetClass());
morphed.PostMorph(GetClass());
PostMorph(morphed, false);
morphed.PostMorph(self, true);
return true;
}
}

25
wadsrc/static/zscript/actors/player/player_morph.zs
View File

@ -140,8 +140,8 @@ extend class PlayerPawn
let morphed = PlayerPawn(Spawn (spawntype, Pos, NO_REPLACE));
// Use GetClass in the event someone actually allows replacements.
PreMorph(morphed.GetClass());
morphed.PreMorph(GetClass());
PreMorph(morphed, false);
morphed.PreMorph(self, true);
EndAllPowerupEffects();
Substitute(morphed);
@ -216,8 +216,8 @@ extend class PlayerPawn
morphed.ScoreIcon = ScoreIcon; // [GRB]
if (eflash)
eflash.target = morphed;
PostMorph(morphed.GetClass());
morphed.PostMorph(GetClass());
PostMorph(morphed, false); // No longer the current body
morphed.PostMorph(self, true); // This is the current body
return true;
}
@ -256,8 +256,9 @@ extend class PlayerPawn
player.morphTics = 2*TICRATE;
return false;
}
PreUnmorph(altmo.GetClass());
altmo.PreUnmorph(GetClass());
PreUnmorph(altmo, false); // This body's about to be left.
altmo.PreUnmorph(self, true); // This one's about to become current.
// No longer using tracer as morph storage. That is what 'alternative' is for.
// If the tracer has changed on the morph, change the original too.
@ -405,8 +406,8 @@ extend class PlayerPawn
beastweap.Destroy ();
}
}
PostUnmorph(altmo.GetClass());
altmo.PostUnmorph(GetClass());
PostUnmorph(altmo, false); // This body is no longer current.
altmo.PostUnmorph(self, true); // altmo body is current.
Destroy ();
// Restore playerclass armor to its normal amount.
let hxarmor = HexenArmor(altmo.FindInventory('HexenArmor'));
@ -556,8 +557,8 @@ class MorphedMonster : Actor
UnmorphTime = level.time + 5*TICRATE; // Next try in 5 seconds
return false;
}
PreUnmorph(unmorphed.GetClass());
unmorphed.PreUnmorph(GetClass());
PreUnmorph(unmorphed, false);
unmorphed.PreUnmorph(self, true);
unmorphed.Angle = Angle;
unmorphed.target = target;
unmorphed.bShadow = bShadow;
@ -577,8 +578,8 @@ class MorphedMonster : Actor
unmorphed.args[4] = args[4];
unmorphed.CopyFriendliness (self, true);
unmorphed.bUnmorphed = false;
PostUnmorph(unmorphed.GetClass());
unmorphed.PostUnmorph(GetClass());
PostUnmorph(unmorphed, false); // From is false here: Leaving the caller's body.
unmorphed.PostUnmorph(self, true); // True here: Entering this body from here.
UnmorphedMe = NULL;
Substitute(unmorphed);
Destroy ();