Pass object_base &to maybe_delete_object
This commit is contained in:
parent
a152ef009b
commit
5907fec742
|
@ -1086,17 +1086,19 @@ static void explode_model(const vobjptr_t obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
//if the object has a destroyed model, switch to it. Otherwise, delete it.
|
//if the object has a destroyed model, switch to it. Otherwise, delete it.
|
||||||
static void maybe_delete_object(const vobjptr_t del_obj)
|
static void maybe_delete_object(object_base &del_obj)
|
||||||
{
|
{
|
||||||
if (Dead_modelnums[del_obj->rtype.pobj_info.model_num] != -1) {
|
const auto dead_modelnum = Dead_modelnums[del_obj.rtype.pobj_info.model_num];
|
||||||
del_obj->rtype.pobj_info.model_num = Dead_modelnums[del_obj->rtype.pobj_info.model_num];
|
if (dead_modelnum != -1)
|
||||||
del_obj->flags |= OF_DESTROYED;
|
{
|
||||||
|
del_obj.rtype.pobj_info.model_num = dead_modelnum;
|
||||||
|
del_obj.flags |= OF_DESTROYED;
|
||||||
}
|
}
|
||||||
else { //normal, multi-stage explosion
|
else { //normal, multi-stage explosion
|
||||||
if (del_obj->type == OBJ_PLAYER)
|
if (del_obj.type == OBJ_PLAYER)
|
||||||
del_obj->render_type = RT_NONE;
|
del_obj.render_type = RT_NONE;
|
||||||
else
|
else
|
||||||
del_obj->flags |= OF_SHOULD_BE_DEAD;
|
del_obj.flags |= OF_SHOULD_BE_DEAD;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue