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

Pass player powerup_flags to init_ai_frame

Browse source
This commit is contained in:
Kp 2016-10-02 00:34:48 +00:00
parent 13f751364d
commit 67e10d532b
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/ai.h
View file

@ -253,7 +253,7 @@ void init_ai_for_ship(void);
extern int Stolen_item_index; // Used in ai.c for controlling rate of Thief flare firing.
// -- unused, 08/07/95 -- extern void ai_turn_randomly(vms_vector *vec_to_player, object *obj, fix rate, int previous_visibility);
extern void init_ai_frame(void);
void init_ai_frame(player_flags);
__attribute_warn_unused_result
std::size_t create_bfs_list(segnum_t start_seg, player_flags, segnum_t *bfs_list, std::size_t max_segs);

9
similar/main/ai.cpp
View file

@ -2810,14 +2810,13 @@ static void ai_do_actual_firing_stuff(const vobjptridx_t obj, ai_static *aip, ai
// ----------------------------------------------------------------------------
void init_ai_frame(void)
void init_ai_frame(const player_flags powerup_flags)
{
Dist_to_last_fired_upon_player_pos = vm_vec_dist_quick(Last_fired_upon_player_pos, Believed_player_pos);
auto &player_info = get_local_plrobj().ctype.player_info;
if (!(player_info.powerup_flags & PLAYER_FLAGS_CLOAKED) ||
(player_info.powerup_flags & PLAYER_FLAGS_HEADLIGHT_ON) ||
(Afterburner_charge && Controls.state.afterburner && (player_info.powerup_flags & PLAYER_FLAGS_AFTERBURNER)))
if (!(powerup_flags & PLAYER_FLAGS_CLOAKED) ||
(powerup_flags & PLAYER_FLAGS_HEADLIGHT_ON) ||
(Afterburner_charge && Controls.state.afterburner && (powerup_flags & PLAYER_FLAGS_AFTERBURNER)))
{
ai_do_cloak_stuff();
}

2
similar/main/game.cpp
View file

@ -1414,7 +1414,7 @@ void GameProcessFrame(void)
do_invulnerable_stuff();
remove_obsolete_stuck_objects();
#if defined(DXX_BUILD_DESCENT_II)
init_ai_frame();
init_ai_frame(player_info.powerup_flags);
do_final_boss_frame();
auto &pl_flags = player_info.powerup_flags;