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

- Fixed: NULL pointer dereference in DrawGem.

Browse source 
SVN r4186 (trunk)
This commit is contained in:
Braden Obrzut 2013-03-18 21:56:15 +00:00
parent 98ea4d3d51
commit 18bf56d3d7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/sbarinfo_commands.cpp
View file

@ -3046,7 +3046,7 @@ class CommandDrawGem : public SBarInfoCommand
} }
void Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged) void Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged)
{ {
goalValue = armor ? statusBar->armor->Amount : statusBar->CPlayer->mo->health; goalValue = armor ? (statusBar->armor ? statusBar->armor->Amount : 0) : statusBar->CPlayer->mo->health;
int max = armor ? 100 : statusBar->CPlayer->mo->GetMaxHealth() + statusBar->CPlayer->mo->stamina; int max = armor ? 100 : statusBar->CPlayer->mo->GetMaxHealth() + statusBar->CPlayer->mo->stamina;
if(max != 0 && goalValue > 0) if(max != 0 && goalValue > 0)
{ {