From e402b0ee514b34d941a44ffa63096f438a00c20d Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Jan 2014 23:56:53 +0000 Subject: [PATCH] Pass objptridx_t to draw_powerup --- common/main/powerup.h | 2 +- similar/main/powerup.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/main/powerup.h b/common/main/powerup.h index 12be6ed08..786b1f644 100644 --- a/common/main/powerup.h +++ b/common/main/powerup.h @@ -125,7 +125,7 @@ extern powerup_type_info Powerup_info[MAX_POWERUP_TYPES]; struct powerup_type_info; #endif -void draw_powerup(object *obj); +void draw_powerup(objptridx_t obj); //returns true if powerup consumed int do_powerup(object *obj); diff --git a/similar/main/powerup.cpp b/similar/main/powerup.cpp index acc3adc48..92d033c52 100644 --- a/similar/main/powerup.cpp +++ b/similar/main/powerup.cpp @@ -128,7 +128,7 @@ static void draw_blob_outline(void) } #endif -void draw_powerup(object *obj) +void draw_powerup(objptridx_t obj) { #ifdef EDITOR blob_vertices[0].x = 0x80000; @@ -137,7 +137,7 @@ void draw_powerup(object *obj) draw_object_blob(obj, Vclip[obj->rtype.vclip_info.vclip_num].frames[obj->rtype.vclip_info.framenum] ); #ifdef EDITOR - if (EditorWindow && (Cur_object_index == obj-Objects)) + if (EditorWindow && (Cur_object_index == obj)) if (blob_vertices[0].x != 0x80000) draw_blob_outline(); #endif