From f0707cb9bd06c76a92bdffb63585c36b6296d732 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Mar 2017 19:56:26 +0000 Subject: [PATCH] Pass canvas to draw_powerup --- common/main/powerup.h | 2 +- similar/main/object.cpp | 2 +- similar/main/powerup.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/main/powerup.h b/common/main/powerup.h index 737b64569..5546f1620 100644 --- a/common/main/powerup.h +++ b/common/main/powerup.h @@ -139,7 +139,7 @@ void powerup_type_info_write(PHYSFS_File *fp, const powerup_type_info &pti); namespace dcx { extern unsigned N_powerup_types; -void draw_powerup(const object_base &obj); +void draw_powerup(grs_canvas &, const object_base &obj); } diff --git a/similar/main/object.cpp b/similar/main/object.cpp index ca44053e7..03b718fe9 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -751,7 +751,7 @@ void render_object(const vobjptridx_t obj) break; } - draw_powerup(obj); + draw_powerup(*grd_curcanv, obj); break; case RT_LASER: diff --git a/similar/main/powerup.cpp b/similar/main/powerup.cpp index 40f5012fa..fb4757fbd 100644 --- a/similar/main/powerup.cpp +++ b/similar/main/powerup.cpp @@ -118,10 +118,10 @@ void do_powerup_frame(const vobjptridx_t obj) namespace dcx { -void draw_powerup(const object_base &obj) +void draw_powerup(grs_canvas &canvas, const object_base &obj) { auto &vci = obj.rtype.vclip_info; - draw_object_blob(*grd_curcanv, obj, Vclip[vci.vclip_num].frames[vci.framenum]); + draw_object_blob(canvas, obj, Vclip[vci.vclip_num].frames[vci.framenum]); } }