From 211d6167b2435e430450cf973fb6f537a2d54fb3 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 13 Nov 2022 21:17:23 +0000 Subject: [PATCH] Inline object_create_muzzle_flash into callers 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`. --- common/main/fireball.h | 1 - similar/main/fireball.cpp | 5 ----- similar/main/laser.cpp | 5 +++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/common/main/fireball.h b/common/main/fireball.h index c930e708c..5bab53a09 100644 --- a/common/main/fireball.h +++ b/common/main/fireball.h @@ -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); diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index d28281d52..704029f5b 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -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; diff --git a/similar/main/laser.cpp b/similar/main/laser.cpp index 6fddab1a9..2610cdbe1 100644 --- a/similar/main/laser.cpp +++ b/similar/main/laser.cpp @@ -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)