diff --git a/common/main/fireball.h b/common/main/fireball.h index 73ebce1bf..a0e918340 100644 --- a/common/main/fireball.h +++ b/common/main/fireball.h @@ -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 diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index fed6d2c3c..1f92bc50f 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -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!