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

- fixed: FastProjectile's movement code was missong a portal check.

Browse source
This commit is contained in:
Christoph Oelckers 2017-08-12 13:55:33 +02:00
parent 89980d9e77
commit 4483d665d4
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.cpp
View file

@ -4036,6 +4036,14 @@ void AActor::CheckPortalTransition(bool islinked)
if (islinked && moved) LinkToWorld(&ctx);
}
DEFINE_ACTION_FUNCTION(AActor, CheckPortalTransition)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_BOOL_DEF(linked);
self->CheckPortalTransition(linked);
return 0;
}
//
// P_MobjThinker
//

1
wadsrc/static/zscript/actor.txt
View file

@ -518,6 +518,7 @@ class Actor : Thinker native
native clearscope int GetRenderStyle() const;
native clearscope bool CheckKeys(int locknum, bool remote, bool quiet = false);
native clearscope Inventory FirstInv() const;
protected native void CheckPortalTransition(bool linked = true);
native clearscope string GetTag(string defstr = "") const;
native void SetTag(string defstr = "");

1
wadsrc/static/zscript/shared/fastprojectile.txt
View file

@ -156,6 +156,7 @@ class FastProjectile : Actor
ExplodeMissile (NULL, NULL);
return;
}
CheckPortalTransition();
if (changexy && ripcount <= 0)
{
ripcount = count >> 3;