Merge branch 'fix-super-flicky-hud-crash' into 'master'

Obj_SuperFlickyOwner: check valid before returning source

Closes #696

See merge request KartKrew/Kart!1623
This commit is contained in:
Oni 2023-11-15 03:30:12 +00:00
commit bfe3e72d3c

View file

@ -765,7 +765,7 @@ mobj_t *Obj_SuperFlickyOwner(const mobj_t* mobj)
{
const Flicky* x = static_cast<const Flicky*>(mobj);
return x->source();
return x->valid() ? x->source() : nullptr;
}
boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj)
@ -780,4 +780,4 @@ boolean Obj_IsSuperFlickyTargettingYou(const mobj_t* mobj, mobj_t *player)
const Flicky* x = static_cast<const Flicky*>(mobj);
return player == x->chasing();
}
}