TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass object_base &to maybe_delete_object

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent a152ef009b
commit 5907fec742
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
similar/main/fireball.cpp
View file

@ -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;
} }
} }