TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass objptridx_t to draw_powerup

Browse source
This commit is contained in:
Kp 2014-01-11 23:56:53 +00:00
parent e2afc332ac
commit e402b0ee51
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/powerup.h
View file

@ -125,7 +125,7 @@ extern powerup_type_info Powerup_info[MAX_POWERUP_TYPES];
struct powerup_type_info; struct powerup_type_info;
#endif #endif
void draw_powerup(object *obj); void draw_powerup(objptridx_t obj);
//returns true if powerup consumed //returns true if powerup consumed
int do_powerup(object *obj); int do_powerup(object *obj);

4
similar/main/powerup.cpp
View file

@ -128,7 +128,7 @@ static void draw_blob_outline(void)
} }
#endif #endif
void draw_powerup(object *obj) void draw_powerup(objptridx_t obj)
{ {
#ifdef EDITOR #ifdef EDITOR
blob_vertices[0].x = 0x80000; 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] ); draw_object_blob(obj, Vclip[obj->rtype.vclip_info.vclip_num].frames[obj->rtype.vclip_info.framenum] );
#ifdef EDITOR #ifdef EDITOR
if (EditorWindow && (Cur_object_index == obj-Objects)) if (EditorWindow && (Cur_object_index == obj))
if (blob_vertices[0].x != 0x80000) if (blob_vertices[0].x != 0x80000)
draw_blob_outline(); draw_blob_outline();
#endif #endif