From 33204bac5c4eb1282ba3ffa3d410883fb2ada3a3 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 2 Jun 2015 03:03:31 +0000 Subject: [PATCH] Make Break_on_object static --- common/main/ai.h | 1 - similar/main/ai.cpp | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/main/ai.h b/common/main/ai.h index 69f77761d..7d4e62114 100644 --- a/common/main/ai.h +++ b/common/main/ai.h @@ -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 diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index d0db60d3b..63cca81d8 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -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;