diff --git a/common/main/fwd-object.h b/common/main/fwd-object.h index 11fab8aed..dc49621ac 100644 --- a/common/main/fwd-object.h +++ b/common/main/fwd-object.h @@ -204,7 +204,7 @@ extern int Death_sequence_aborted; extern objnum_t Player_fired_laser_this_frame; // Draw a blob-type object, like a fireball -void draw_object_blob(const object_base &obj, bitmap_index bitmap); +void draw_object_blob(grs_canvas &, const object_base &obj, bitmap_index bitmap); } #ifdef dsx diff --git a/similar/main/laser.cpp b/similar/main/laser.cpp index 5f0447edd..fa48148c9 100644 --- a/similar/main/laser.cpp +++ b/similar/main/laser.cpp @@ -94,7 +94,7 @@ void Laser_render(const object_base &obj) //Laser_draw_one(obj-Objects, Weapon_info[obj->id].bitmap ); break; case WEAPON_RENDER_BLOB: - draw_object_blob(obj, wi.bitmap); + draw_object_blob(*grd_curcanv, obj, wi.bitmap); break; case WEAPON_RENDER_POLYMODEL: break; diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 76e3f2189..b4209ca39 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -151,7 +151,7 @@ objptridx_t obj_find_first_of_type(int type) namespace dcx { //draw an object that has one bitmap & doesn't rotate -void draw_object_blob(const object_base &obj, bitmap_index bmi) +void draw_object_blob(grs_canvas &canvas, const object_base &obj, const bitmap_index bmi) { auto &bm = GameBitmaps[bmi.index]; PIGGY_PAGE_IN( bmi ); @@ -172,7 +172,7 @@ void draw_object_blob(const object_base &obj, bitmap_index bmi) const auto p = (bm_w > bm_h) ? wh(osize, fixmuldiv(osize, bm_h, bm_w)) : wh(fixmuldiv(osize, bm_w, bm_h), osize); - g3_draw_bitmap(*grd_curcanv, pos, p.first, p.second, bm); + g3_draw_bitmap(canvas, pos, p.first, p.second, bm); } } diff --git a/similar/main/powerup.cpp b/similar/main/powerup.cpp index f54ffb863..40f5012fa 100644 --- a/similar/main/powerup.cpp +++ b/similar/main/powerup.cpp @@ -121,7 +121,7 @@ namespace dcx { void draw_powerup(const object_base &obj) { auto &vci = obj.rtype.vclip_info; - draw_object_blob(obj, Vclip[vci.vclip_num].frames[vci.framenum]); + draw_object_blob(*grd_curcanv, obj, Vclip[vci.vclip_num].frames[vci.framenum]); } } diff --git a/similar/main/vclip.cpp b/similar/main/vclip.cpp index 2edfe9f3b..7ebb9b5ed 100644 --- a/similar/main/vclip.cpp +++ b/similar/main/vclip.cpp @@ -63,11 +63,9 @@ void draw_vclip_object(const vobjptridx_t obj,fix timeleft,int lighted, int vcli draw_object_tmap_rod(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum],lighted); else { Assert(lighted==0); //blob cannot now be lighted - - draw_object_blob(obj, Vclip[vclip_num].frames[bitmapnum] ); + draw_object_blob(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum] ); } } - }