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

Inline object_create_muzzle_flash into callers

Browse source 
object_create_muzzle_flash delegated to
object_create_explosion_without_damage, adding one parameter that
callers ought to provide instead.  Inline object_create_muzzle_flash into
callers and change them to provide `Vclip`.
This commit is contained in:
Kp 2022-11-13 21:17:23 +00:00
parent ca1e3b1540
commit 211d6167b2
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/fireball.h
View file

@ -52,7 +52,6 @@ static_assert(sizeof(disk_expl_wall) == 12, "sizeof(disk_expl_wall) wrong");
#endif
imobjptridx_t object_create_explosion_without_damage(const d_vclip_array &Vclip, vmsegptridx_t segnum, const vms_vector &position, fix size, int vclip_type);
void object_create_muzzle_flash(vmsegptridx_t segnum, const vms_vector &position, fix size, int vclip_type);
imobjptridx_t object_create_badass_explosion(const d_robot_info_array &Robot_info, imobjptridx_t objp, vmsegptridx_t segnum, const vms_vector &position, fix size, int vclip_type,
fix maxdamage, fix maxdistance, fix maxforce, icobjptridx_t parent);

5
similar/main/fireball.cpp
View file

@ -560,11 +560,6 @@ static imobjptridx_t object_create_explosion_with_damage(const d_robot_info_arra
}
void object_create_muzzle_flash(const vmsegptridx_t segnum, const vms_vector &position, fix size, int vclip_type )
{
object_create_explosion_without_damage(Vclip, segnum, position, size, vclip_type);
}
imobjptridx_t object_create_badass_explosion(const d_robot_info_array &Robot_info, const imobjptridx_t objp, const vmsegptridx_t segnum, const vms_vector &position, fix size, int vclip_type, fix maxdamage, fix maxdistance, fix maxforce, const icobjptridx_t parent )
{
auto &Objects = LevelUniqueObjectState.Objects;

5
similar/main/laser.cpp
View file

@ -52,6 +52,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "multi.h"
#include "fwd-wall.h"
#include "playsave.h"
#include "vclip.h"
#include "compiler-range_for.h"
#include "d_levelstate.h"
@ -706,7 +707,7 @@ imobjptridx_t Laser_create_new(const vms_vector &direction, const vms_vector &po
if (parent != Viewer && parent->type != OBJ_WEAPON) {
// Muzzle flash
if (weapon_info.flash_vclip > -1 )
object_create_muzzle_flash(vmsegptridx(obj->segnum), obj->pos, weapon_info.flash_size, weapon_info.flash_vclip);
object_create_explosion_without_damage(Vclip, vmsegptridx(obj->segnum), obj->pos, weapon_info.flash_size, weapon_info.flash_vclip);
}
do_omega_stuff(vmsegptridx, parent, position, obj);
@ -815,7 +816,7 @@ imobjptridx_t Laser_create_new(const vms_vector &direction, const vms_vector &po
if (( parent != Viewer ) && (parent->type != OBJ_WEAPON)) {
// Muzzle flash
if (weapon_info.flash_vclip > -1 )
object_create_muzzle_flash(segnum.absolute_sibling(obj->segnum), obj->pos, weapon_info.flash_size, weapon_info.flash_vclip);
object_create_explosion_without_damage(Vclip, segnum.absolute_sibling(obj->segnum), obj->pos, weapon_info.flash_size, weapon_info.flash_vclip);
}
if (weapon_info.flash_sound > -1)