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

Fix strange crash when player's weapon is removed.

Browse source
This commit is contained in:
RaveYard 2023-08-01 14:55:23 +02:00 committed by Christoph Oelckers
parent ed5d81271b
commit 01a6dafe6a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rendering/hwrenderer/scene/hw_weapon.cpp
View file

@ -691,10 +691,12 @@ void HWDrawInfo::PreparePlayerSprites2D(sector_t * viewsector, area_t in_area, F
if(weap.weapon && weap.weapon->GetCaller())
{
PClass * cls = weap.weapon->GetCaller()->GetClass();
ModifyBobLayer = cls->Virtuals.Size() > ModifyBobLayerVIndex ? cls->Virtuals[ModifyBobLayerVIndex] : nullptr;
if( ModifyBobLayer == ModifyBobLayerOrigFunc) ModifyBobLayer = nullptr;
if(auto caller = weap.weapon->GetCaller())
{
PClass* cls = caller->GetClass();
ModifyBobLayer = cls->Virtuals.Size() > ModifyBobLayerVIndex ? cls->Virtuals[ModifyBobLayerVIndex] : nullptr;
if( ModifyBobLayer == ModifyBobLayerOrigFunc) ModifyBobLayer = nullptr;
}
}
// hack alert! Rather than changing everything in the underlying lighting code let's just temporarily change