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

Fixed: the strife firehands were interpolated if a mod used the layer before them

Browse source 
The flags were also already reset, no need to do it twice
This commit is contained in:
Leonard2 2016-06-18 09:46:55 +02:00
parent b8e1bead0a
commit 3ea70980f9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_strife/a_strifestuff.cpp
View file

@ -352,10 +352,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_ItBurnsItBurns)
if (self->player != nullptr && self->player->mo == self)
{
DPSprite *psp = self->player->GetPSprite(PSP_STRIFEHANDS);
psp->Flags &= PSPF_ADDWEAPON | PSPF_ADDBOB;
psp->y = WEAPONTOP;
psp->SetState(self->FindState("FireHands"));
P_SetPsprite(self->player, PSP_STRIFEHANDS, self->FindState("FireHands"));
self->player->ReadyWeapon = nullptr;
self->player->PendingWeapon = WP_NOCHANGE;

4
src/p_pspr.cpp
View file

@ -229,6 +229,10 @@ DPSprite *player_t::GetPSprite(PSPLayers layer)
{
pspr->Flags = (PSPF_ADDWEAPON|PSPF_ADDBOB|PSPF_CVARFAST|PSPF_POWDOUBLE);
}
if (layer == PSP_STRIFEHANDS)
{
pspr->y = WEAPONTOP;
}
pspr->oldx = pspr->x;
pspr->oldy = pspr->y;