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

fix rare crash due to null caller

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-08-01 13:42:49 -03:00 committed by Rachael Alexanderson
parent bcbb85b1dd
commit 1852f14f30
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -690,7 +690,7 @@ void HWDrawInfo::PreparePlayerSprites2D(sector_t * viewsector, area_t in_area)
VMFunction * ModifyBobLayer = nullptr; VMFunction * ModifyBobLayer = nullptr;
DVector2 bobxy = DVector2(weap.bobx , weap.boby); DVector2 bobxy = DVector2(weap.bobx , weap.boby);
if(weap.weapon) if(weap.weapon && weap.weapon->GetCaller())
{ {
PClass * cls = weap.weapon->GetCaller()->GetClass(); PClass * cls = weap.weapon->GetCaller()->GetClass();
ModifyBobLayer = cls->Virtuals.Size() > ModifyBobLayerVIndex ? cls->Virtuals[ModifyBobLayerVIndex] : nullptr; ModifyBobLayer = cls->Virtuals.Size() > ModifyBobLayerVIndex ? cls->Virtuals[ModifyBobLayerVIndex] : nullptr;
@ -774,7 +774,7 @@ void HWDrawInfo::PreparePlayerSprites3D(sector_t * viewsector, area_t in_area)
DVector3 rotation = DVector3(weap.rotation); DVector3 rotation = DVector3(weap.rotation);
DVector3 pivot = DVector3(weap.pivot); DVector3 pivot = DVector3(weap.pivot);
if(weap.weapon) if(weap.weapon && weap.weapon->GetCaller())
{ {
PClass * cls = weap.weapon->GetCaller()->GetClass(); PClass * cls = weap.weapon->GetCaller()->GetClass();
ModifyBobLayer3D = cls->Virtuals.Size() > ModifyBobLayer3DVIndex ? cls->Virtuals[ModifyBobLayer3DVIndex] : nullptr; ModifyBobLayer3D = cls->Virtuals.Size() > ModifyBobLayer3DVIndex ? cls->Virtuals[ModifyBobLayer3DVIndex] : nullptr;