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

Simplify passing weapon to do_missile_firing

Browse source 
When the player fires a generic secondary, the choice of proximity bomb
versus super-mine is never read.  When the player specifically drops a
bomb, only that choice needs to be read.  Pass the chosen weapon as an
argument, and avoid computing the choice on the path where it is never
read.
This commit is contained in:
Kp 2022-07-23 20:58:10 +00:00
parent b4fcb9c305
commit 52aa9891b9
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/laser.h
View file

@ -89,7 +89,7 @@ void Flare_create(vmobjptridx_t obj);
bool laser_are_related(vcobjptridx_t o1, vcobjptridx_t o2);
void do_laser_firing_player(object &);
void do_missile_firing(int drop_bomb, const secondary_weapon_index_t bomb, const vmobjptridx_t plrobjidx);
void do_missile_firing(const secondary_weapon_index_t weapon, const vmobjptridx_t plrobjidx);
// Fires a laser-type weapon (a Primary weapon)
// Fires from object objnum, weapon type weapon_id.

5
similar/main/gamecntl.cpp
View file

@ -300,8 +300,7 @@ static void do_weapon_n_item_stuff(object_array &Objects, control_info &Controls
if (Global_missile_firing_count) {
--Global_missile_firing_count;
const auto bomb = which_bomb(player_info);
do_missile_firing(0, bomb, plrobjidx);
do_missile_firing(player_info.Secondary_weapon, plrobjidx);
}
if (Controls.state.cycle_primary > 0)
@ -339,7 +338,7 @@ static void do_weapon_n_item_stuff(object_array &Objects, control_info &Controls
{
const auto bomb = which_bomb(player_info);
for (uint_fast32_t i = std::exchange(Controls.state.drop_bomb, 0); i--;)
do_missile_firing(1, bomb, plrobjidx);
do_missile_firing(bomb, plrobjidx);
}
#if defined(DXX_BUILD_DESCENT_II)
if (Controls.state.toggle_bomb > 0)

3
similar/main/laser.cpp
View file

@ -2322,14 +2322,13 @@ void release_remote_guided_missile(d_level_unique_object_state &LevelUniqueObjec
// -------------------------------------------------------------------------------------------
//changed on 31/3/10 by kreatordxx to distinguish between drop bomb and secondary fire
void do_missile_firing(int drop_bomb, const secondary_weapon_index_t bomb, const vmobjptridx_t plrobjidx)
void do_missile_firing(const secondary_weapon_index_t weapon, const vmobjptridx_t plrobjidx)
{
int gun_flag=0;
fix fire_frame_overhead = 0;
auto &plrobj = *plrobjidx;
auto &player_info = plrobj.ctype.player_info;
const auto weapon = drop_bomb ? bomb : player_info.Secondary_weapon;
assert(weapon < MAX_SECONDARY_WEAPONS);
auto &Next_missile_fire_time = player_info.Next_missile_fire_time;
if (GameTime64 - Next_missile_fire_time <= FrameTime) // if firing is prolonged by FrameTime overhead, let's try to fix that.