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

- Fix missing null pointer check (Nashgore crash).

Browse source
This commit is contained in:
drfrag 2020-12-19 18:48:29 +01:00
parent f5a1a5efba
commit e99cc45428
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_map.cpp
View file

@ -6258,12 +6258,13 @@ void P_DoCrunch(AActor *thing, FChangePosition *cpos)
PClassActor *bloodcls = thing->GetBloodType(); PClassActor *bloodcls = thing->GetBloodType();
P_TraceBleed (newdam > 0 ? newdam : cpos->crushchange, thing); P_TraceBleed (newdam > 0 ? newdam : cpos->crushchange, thing);
if (bloodcls != NULL) if (bloodcls != nullptr)
{ {
AActor *mo; AActor *mo;
mo = Spawn(bloodcls, thing->PosPlusZ(thing->Height / 2), ALLOW_REPLACE); mo = Spawn(bloodcls, thing->PosPlusZ(thing->Height / 2), ALLOW_REPLACE);
if (mo == nullptr) goto noblood;
mo->Vel.X = pr_crunch.Random2() / 16.; mo->Vel.X = pr_crunch.Random2() / 16.;
mo->Vel.Y = pr_crunch.Random2() / 16.; mo->Vel.Y = pr_crunch.Random2() / 16.;
if (thing->BloodTranslation != 0 && !(mo->flags2 & MF2_DONTTRANSLATE)) if (thing->BloodTranslation != 0 && !(mo->flags2 & MF2_DONTTRANSLATE))
@ -6278,7 +6279,7 @@ void P_DoCrunch(AActor *thing, FChangePosition *cpos)
if (!(cl_bloodtype <= 1)) mo->renderflags |= RF_INVISIBLE; if (!(cl_bloodtype <= 1)) mo->renderflags |= RF_INVISIBLE;
} }
noblood:
DAngle an = (M_Random() - 128) * (360./256); DAngle an = (M_Random() - 128) * (360./256);
if (cl_bloodtype >= 1) if (cl_bloodtype >= 1)
{ {