From 5ab50520b74cb98469f8dcad20c420d64cd1cf3d Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 20 Jun 2019 04:02:27 +0000 Subject: [PATCH] Remove unused vec_to_player in D1 ai_follow_path Only Descent 2 uses this field. --- common/main/ai.h | 5 +++++ similar/main/aipath.cpp | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/main/ai.h b/common/main/ai.h index 85ebac206..b0ebac0e4 100644 --- a/common/main/ai.h +++ b/common/main/ai.h @@ -127,6 +127,11 @@ void do_ai_frame_all(); extern void create_all_paths(void); namespace dsx { void create_path_to_station(vmobjptridx_t objp, int max_length); +#if defined(DXX_BUILD_DESCENT_I) +#define ai_follow_path(o,pv,vec) ai_follow_path(o,pv) +#else +#undef ai_follow_path +#endif void ai_follow_path(vmobjptridx_t objp, int player_visibility, const vms_vector *vec_to_player); void ai_turn_towards_vector(const vms_vector &vec_to_player, object_base &obj, fix rate); extern void init_ai_objects(void); diff --git a/similar/main/aipath.cpp b/similar/main/aipath.cpp index c8f0b8f6a..c372462cc 100644 --- a/similar/main/aipath.cpp +++ b/similar/main/aipath.cpp @@ -919,9 +919,6 @@ static void create_path(const vmobjptridx_t objp) // Optimization: If current velocity will take robot near goal, don't change velocity void ai_follow_path(const vmobjptridx_t objp, int player_visibility, const vms_vector *vec_to_player) { -#if defined(DXX_BUILD_DESCENT_I) - (void)vec_to_player; -#endif ai_static *aip = &objp->ctype.ai_info; vms_vector goal_point, new_goal_point;