From 450b3ec4f5a43c9621fba66fd6d71cede13ae2ca Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Mar 2017 19:56:25 +0000 Subject: [PATCH] Pass canvas to draw_weapon_vclip --- common/main/vclip.h | 2 +- similar/main/object.cpp | 2 +- similar/main/vclip.cpp | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/main/vclip.h b/common/main/vclip.h index 5b7b6af57..f094f992a 100644 --- a/common/main/vclip.h +++ b/common/main/vclip.h @@ -81,7 +81,7 @@ extern array Vclip; // draw an object which renders as a vclip. void draw_vclip_object(grs_canvas &, vcobjptridx_t obj, fix timeleft, int lighted, int vclip_num); -void draw_weapon_vclip(vobjptridx_t obj); +void draw_weapon_vclip(grs_canvas &, vcobjptridx_t obj); } namespace dcx { diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 72ab6fab9..8bdfd7e9f 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -685,7 +685,7 @@ void render_object(const vobjptridx_t obj) gr_settransblend(*grd_curcanv, 7, GR_BLEND_ADDITIVE_A); } - draw_weapon_vclip(obj); + draw_weapon_vclip(*grd_curcanv, obj); break; case RT_HOSTAGE: diff --git a/similar/main/vclip.cpp b/similar/main/vclip.cpp index 5a951feb0..094c20d1e 100644 --- a/similar/main/vclip.cpp +++ b/similar/main/vclip.cpp @@ -68,8 +68,7 @@ void draw_vclip_object(grs_canvas &canvas, const vcobjptridx_t obj, const fix ti } } - -void draw_weapon_vclip(const vobjptridx_t obj) +void draw_weapon_vclip(grs_canvas &canvas, const vcobjptridx_t obj) { int vclip_num; fix modtime,play_time; @@ -103,7 +102,7 @@ void draw_weapon_vclip(const vobjptridx_t obj) while (modtime > play_time) modtime -= play_time; - draw_vclip_object(*grd_curcanv, obj, modtime, 0, vclip_num); + draw_vclip_object(canvas, obj, modtime, 0, vclip_num); } }