From fe9c1a139a6755383d6027c5b5d32632d16b098b Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Jan 2014 23:17:14 +0000 Subject: [PATCH] Pass objptridx_t to do_any_robot_dying_frame --- similar/main/ai.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 5500bc889..2175fd142 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -2289,9 +2289,8 @@ static void do_boss_dying_frame(objptridx_t objp) } } -static int do_any_robot_dying_frame(object *objp) +static int do_any_robot_dying_frame(objptridx_t) { - (void)objp; return 0; } #elif defined(DXX_BUILD_DESCENT_II) @@ -2416,7 +2415,7 @@ static void do_boss_dying_frame(objptridx_t objp) } // ---------------------------------------------------------------------- -static int do_any_robot_dying_frame(object *objp) +static int do_any_robot_dying_frame(objptridx_t objp) { if (objp->ctype.ai_info.dying_start_time) { int rval, death_roll; @@ -2427,7 +2426,7 @@ static int do_any_robot_dying_frame(object *objp) if (rval) { objp->ctype.ai_info.dying_start_time = GameTime64; // make sure following only happens one time! explode_object(objp, F1_0/4); - digi_link_sound_to_object2(SOUND_BADASS_EXPLOSION, objp-Objects, 0, F2_0, F1_0*512); + digi_link_sound_to_object2(SOUND_BADASS_EXPLOSION, objp, 0, F2_0, F1_0*512); if ((Current_level_num < 0) && (Robot_info[get_robot_id(objp)].thief)) recreate_thief(objp); }