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

Make Break_on_object static

Browse source
This commit is contained in:
Kp 2015-06-02 03:03:31 +00:00
parent bb5fd12ffe
commit 33204bac5c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/ai.h
View file

@ -258,7 +258,6 @@ extern fix64 Boss_hit_time;
// Index into this array with aip->GOAL_STATE or aip->CURRENT_STATE
extern int Do_ai_flag;
extern objnum_t Break_on_object;
#endif //ifndef NDEBUG

5
similar/main/ai.cpp
View file

@ -1531,8 +1531,6 @@ void make_random_vector(vms_vector &vec)
}
// -------------------------------------------------------------------------------------------------------------------
objnum_t Break_on_object = object_none;
static void do_firing_stuff(const vobjptr_t obj, int player_visibility, const vms_vector &vec_to_player)
{
#if defined(DXX_BUILD_DESCENT_I)
@ -2889,6 +2887,9 @@ static bool is_break_object(vcobjptridx_t)
return false;
}
#else
__attribute_used
static objnum_t Break_on_object = object_none;
static bool is_break_object(const vcobjptridx_t robot)
{
return Break_on_object == robot;