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

Pass objptridx_t to explode_object

Browse source
This commit is contained in:
Kp 2014-01-11 23:55:24 +00:00
parent 43c1ce1360
commit e2afc332ac
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fireball.h
View file

@ -59,7 +59,7 @@ void explode_badass_weapon(objptridx_t obj,vms_vector *pos);
// blows up the player with a badass explosion
void explode_badass_player(object *obj);
void explode_object(object *obj,fix delay_time);
void explode_object(objptridx_t obj,fix delay_time);
void do_explosion_sequence(object *obj);
void do_debris_frame(objptridx_t obj); // deal with debris for this frame

4
similar/main/fireball.cpp
View file

@ -1072,7 +1072,7 @@ static void maybe_delete_object(object *del_obj)
// -------------------------------------------------------------------------------------------------------
//blow up an object. Takes the object to destroy, and the point of impact
void explode_object(object *hitobj,fix delay_time)
void explode_object(objptridx_t hitobj,fix delay_time)
{
if (hitobj->flags & OF_EXPLODING) return;
@ -1096,7 +1096,7 @@ void explode_object(object *hitobj,fix delay_time)
//now set explosion-specific data
obj->lifeleft = delay_time;
obj->ctype.expl_info.delete_objnum = hitobj-Objects;
obj->ctype.expl_info.delete_objnum = hitobj;
#ifndef NDEBUG
if (obj->ctype.expl_info.delete_objnum < 0)
Int3(); // See Rob!