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

Use objptridx_t for object_create_badass_explosion

Browse source
This commit is contained in:
Kp 2014-01-05 05:17:34 +00:00
parent 58ed12ffce
commit 0d49f5b55a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fireball.h
View file

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

6
similar/main/fireball.cpp
View file

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