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

Added 2 new layer flags: PSPF_CVARFAST and PSPF_POWDOUBLE

Browse source 
These flags allowed to easily restore a lost part of the targeter layers
behavior
This commit is contained in:
Leonard2 2016-06-02 23:58:21 +02:00
parent bc334ccc9f
commit 543414d31f
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_pspr.cpp
View file

@ -143,7 +143,7 @@ DPSprite::DPSprite(player_t *owner, AInventory *caller, int id)
Next->Destroy(); // Replace it.
if (Caller->IsKindOf(RUNTIME_CLASS(AWeapon)))
Flags = (PSPF_ADDWEAPON|PSPF_ADDBOB);
Flags = (PSPF_ADDWEAPON|PSPF_ADDBOB|PSPF_POWDOUBLE|PSPF_CVARFAST);
}
//------------------------------------------------------------------------
@ -210,6 +210,10 @@ DPSprite *player_t::GetPSprite(PSPLayers layer)
if (newcaller != oldcaller)
{ // Only change the flags if this layer was created now or if we updated the caller.
if (layer >= PSP_TARGETCENTER)
{ // The targeter layers were affected by those.
pspr->Flags |= (PSPF_CVARFAST|PSPF_POWDOUBLE);
}
if (layer != PSP_FLASH)
{ // Only the flash layer should follow the weapon.
pspr->Flags &= ~PSPF_ADDWEAPON;
@ -286,7 +290,7 @@ void DPSprite::SetState(FState *newstate, bool pending)
Tics = newstate->GetTics(); // could be 0
if (Caller->IsKindOf(RUNTIME_CLASS(AWeapon)))
if (Flags & PSPF_CVARFAST)
{
if (sv_fastweapons == 2 && ID == PSP_WEAPON)
Tics = newstate->ActionFunc == nullptr ? 0 : 1;
@ -1358,7 +1362,7 @@ void DPSprite::Tick()
Tics--;
// [BC] Apply double firing speed.
if (Caller->IsKindOf(RUNTIME_CLASS(AWeapon)) && Tics && Owner->cheats & CF_DOUBLEFIRINGSPEED)
if ((Flags & PSPF_POWDOUBLE) && Tics && (Owner->cheats & CF_DOUBLEFIRINGSPEED))
Tics--;
if (!Tics)

2
src/p_pspr.h
View file

@ -55,6 +55,8 @@ enum PSPFlags
{
PSPF_ADDWEAPON = 1 << 0,
PSPF_ADDBOB = 1 << 1,
PSPF_POWDOUBLE = 1 << 2,
PSPF_CVARFAST = 1 << 3,
};
class DPSprite : public DObject

2
wadsrc/static/actors/constants.txt
View file

@ -575,6 +575,8 @@ enum
{
PSPF_ADDWEAPON = 1 << 0,
PSPF_ADDBOB = 1 << 1,
PSPF_POWDOUBLE = 1 << 2,
PSPF_CVARFAST = 1 << 3,
};
// Default psprite layers