From 6e0e286dc81ca67f794d53fb24a4ce751150e612 Mon Sep 17 00:00:00 2001 From: Kp Date: Wed, 6 Apr 2016 03:34:15 +0000 Subject: [PATCH] Pass object &to start_robot_death_sequence --- common/main/ai.h | 2 +- similar/main/ai.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/main/ai.h b/common/main/ai.h index e828a3b3c..51d1eeb6d 100644 --- a/common/main/ai.h +++ b/common/main/ai.h @@ -270,7 +270,7 @@ extern void init_thief_for_level(); extern objnum_t Buddy_objnum; extern int Buddy_allowed_to_talk; -void start_robot_death_sequence(vobjptr_t objp); +void start_robot_death_sequence(object &objp); void buddy_message_str(const char * str) __attribute_nonnull(); void buddy_message(const char * format, ... ) __attribute_format_printf(1, 2); #define buddy_message(F,...) dxx_call_printf_checked(buddy_message,buddy_message_str,(),(F),##__VA_ARGS__) diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 2dc76440e..4095ffd0d 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -2303,12 +2303,12 @@ void init_ai_for_ship(void) } // ---------------------------------------------------------------------- -void start_robot_death_sequence(const vobjptr_t objp) +void start_robot_death_sequence(object &obj) { - objp->ctype.ai_info.dying_start_time = GameTime64; - objp->ctype.ai_info.dying_sound_playing = 0; - objp->ctype.ai_info.SKIP_AI_COUNT = 0; - + auto &ai_info = obj.ctype.ai_info; + ai_info.dying_start_time = GameTime64; + ai_info.dying_sound_playing = 0; + ai_info.SKIP_AI_COUNT = 0; } // ----------------------------------------------------------------------