diff --git a/common/main/fireball.h b/common/main/fireball.h index d060ee723..558b29c15 100644 --- a/common/main/fireball.h +++ b/common/main/fireball.h @@ -48,7 +48,7 @@ extern expl_wall expl_wall_list[MAX_EXPLODING_WALLS]; objptridx_t object_create_explosion(short segnum, vms_vector *position, fix size, int vclip_type); void object_create_muzzle_flash(short segnum, vms_vector *position, fix size, int vclip_type); -object *object_create_badass_explosion(object *objp, short segnum, +objptridx_t object_create_badass_explosion(object *objp, short segnum, vms_vector *position, fix size, int vclip_type, fix maxdamage, fix maxdistance, fix maxforce, int parent); diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index 272f0f3a6..a86ade403 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -276,11 +276,9 @@ objptridx_t object_create_explosion(short segnum, vms_vector * position, fix siz return object_create_explosion_sub(NULL, segnum, position, size, vclip_type, 0, 0, 0, object_none ); } -object *object_create_badass_explosion(object *objp, short segnum, vms_vector * position, fix size, int vclip_type, fix maxdamage, fix maxdistance, fix maxforce, int parent ) +objptridx_t object_create_badass_explosion(object *objp, short segnum, vms_vector * position, fix size, int vclip_type, fix maxdamage, fix maxdistance, fix maxforce, int parent ) { - object *rval; - - rval = object_create_explosion_sub(objp, segnum, position, size, vclip_type, maxdamage, maxdistance, maxforce, parent ); + objptridx_t rval = object_create_explosion_sub(objp, segnum, position, size, vclip_type, maxdamage, maxdistance, maxforce, parent ); if ((objp != NULL) && (objp->type == OBJ_WEAPON)) create_smart_children(objp, NUM_SMART_CHILDREN);