zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed IsHUDModelForPlayerAvailable limitation.

Browse source
This commit is contained in:
Marisa Kirisame 2021-02-20 11:35:14 +01:00 committed by Christoph Oelckers
parent 888eab3063
commit 1d96b68e1a
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/r_data/models.cpp
View file

@ -777,20 +777,14 @@ FSpriteModelFrame * FindModelFrame(const PClass * ti, int sprite, int frame, boo
bool IsHUDModelForPlayerAvailable (player_t * player)
{
if (player == nullptr || player->ReadyWeapon == nullptr)
if (player == nullptr || player->psprites == nullptr)
return false;
// [MK] allow the Strife burning hands to be a model...
DPSprite *psp = player->FindPSprite(PSP_STRIFEHANDS);
// [MK] ...otherwise, check for the weapon psprite as per usual
if (psp == nullptr)
psp = player->FindPSprite(PSP_WEAPON);
if (psp == nullptr)
return false;
FSpriteModelFrame *smf = FindModelFrame(psp->Caller->GetClass(), psp->GetSprite(), psp->GetFrame(), false);
return ( smf != nullptr );
// [MK] check that at least one psprite uses models
for (DPSprite *psp = player->psprites; psp != nullptr && psp->GetID() < PSP_TARGETCENTER; psp = psp->GetNext())
{
FSpriteModelFrame *smf = FindModelFrame(psp->Caller->GetClass(), psp->GetSprite(), psp->GetFrame(), false);
if ( smf != nullptr ) return true;
}
return false;
}