zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-21 19:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added PSpriteTick virtual

Browse source
This commit is contained in:
Boondorl 2024-03-29 11:02:46 -04:00 committed by Rachael Alexanderson
parent b0137e50ee
commit c622c63127
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -509,6 +509,11 @@ class Actor : Thinker native
native clearscope void DisableLocalRendering(uint playerNum, bool disable); native clearscope void DisableLocalRendering(uint playerNum, bool disable);
native ui bool ShouldRenderLocally(); // Only clients get to check this, never the playsim. native ui bool ShouldRenderLocally(); // Only clients get to check this, never the playsim.
// Called when the Actor is being used within a PSprite. This happens before potentially changing PSprite
// state so that any custom actions based on things like player input can be done before moving to the next
// state of something like a weapon.
virtual void PSpriteTick(PSprite psp) {}
// 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.
// If true, the item will attempt to be picked up. Useful for things like // If true, the item will attempt to be picked up. Useful for things like
// allowing morphs to pick up limited items such as keys while preventing // allowing morphs to pick up limited items such as keys while preventing

22
wadsrc/static/zscript/actors/player/player.zs
View file

@ -2708,13 +2708,23 @@ class PSprite : Object native play
{ {
if (processPending) if (processPending)
{ {
// drop tic count and possibly change state if (Caller)
if (Tics != -1) // a -1 tic count never changes
{ {
Tics--; Caller.PSpriteTick(self);
// [BC] Apply double firing speed. if (bDestroyed)
if (bPowDouble && Tics && (Owner.mo.FindInventory ("PowerDoubleFiringSpeed", true))) Tics--; return;
if (!Tics && Caller != null) SetState(CurState.NextState); }
if (processPending)
{
// drop tic count and possibly change state
if (Tics != -1) // a -1 tic count never changes
{
Tics--;
// [BC] Apply double firing speed.
if (bPowDouble && Tics && (Owner.mo.FindInventory ("PowerDoubleFiringSpeed", true))) Tics--;
if (!Tics && Caller != null) SetState(CurState.NextState);
}
} }
} }
} }