diff --git a/common/main/vclip.h b/common/main/vclip.h index d5d2cc9e7..5b7b6af57 100644 --- a/common/main/vclip.h +++ b/common/main/vclip.h @@ -80,7 +80,7 @@ namespace dsx { extern array Vclip; // draw an object which renders as a vclip. -void draw_vclip_object(vobjptridx_t obj, fix timeleft, int lighted, int vclip_num); +void draw_vclip_object(grs_canvas &, vcobjptridx_t obj, fix timeleft, int lighted, int vclip_num); void draw_weapon_vclip(vobjptridx_t obj); } diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index b9dbe2ca2..a3bd50e5c 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -411,7 +411,7 @@ static void object_create_debris(const object_base &parent, int subobj_num) void draw_fireball(const vobjptridx_t obj) { if ( obj->lifeleft > 0 ) - draw_vclip_object(obj,obj->lifeleft,0, get_fireball_id(obj)); + draw_vclip_object(*grd_curcanv, obj, obj->lifeleft, 0, get_fireball_id(obj)); } // -------------------------------------------------------------------------------------------------------------------- diff --git a/similar/main/vclip.cpp b/similar/main/vclip.cpp index 7ebb9b5ed..5a951feb0 100644 --- a/similar/main/vclip.cpp +++ b/similar/main/vclip.cpp @@ -46,7 +46,7 @@ namespace dsx { array Vclip; // General purpose vclips. //draw an object which renders as a vclip -void draw_vclip_object(const vobjptridx_t obj,fix timeleft,int lighted, int vclip_num) +void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix timeleft, const int lighted, const int vclip_num) { int nf,bitmapnum; @@ -60,10 +60,10 @@ void draw_vclip_object(const vobjptridx_t obj,fix timeleft,int lighted, int vcli if (bitmapnum >= 0 ) { if (Vclip[vclip_num].flags & VF_ROD) - draw_object_tmap_rod(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum],lighted); + draw_object_tmap_rod(canvas, obj, Vclip[vclip_num].frames[bitmapnum],lighted); else { Assert(lighted==0); //blob cannot now be lighted - draw_object_blob(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum] ); + draw_object_blob(canvas, obj, Vclip[vclip_num].frames[bitmapnum] ); } } } @@ -103,8 +103,7 @@ void draw_weapon_vclip(const vobjptridx_t obj) while (modtime > play_time) modtime -= play_time; - draw_vclip_object(obj, modtime, 0, vclip_num); - + draw_vclip_object(*grd_curcanv, obj, modtime, 0, vclip_num); } }