From 59b57bd7dcc12947f9fe4d758c900b82dd8d1a62 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Feb 2017 21:42:40 +0000 Subject: [PATCH] Pass canvas to g3_check_and_draw_tmap --- common/include/3d.h | 8 ++++---- similar/main/terrain.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/include/3d.h b/common/include/3d.h index 7e4b4b5fe..45ec23896 100644 --- a/common/include/3d.h +++ b/common/include/3d.h @@ -250,16 +250,16 @@ static inline void g3_check_and_draw_poly(const array &pointlis } template -static inline void g3_check_and_draw_tmap(unsigned nv, const array &pointlist, const array &uvl_list, const array &light_rgb, grs_bitmap &bm) +static inline void g3_check_and_draw_tmap(grs_canvas &canvas, unsigned nv, const array &pointlist, const array &uvl_list, const array &light_rgb, grs_bitmap &bm) { if (do_facing_check(pointlist)) - g3_draw_tmap(*grd_curcanv, nv, pointlist, uvl_list, light_rgb, bm); + g3_draw_tmap(canvas, nv, pointlist, uvl_list, light_rgb, bm); } template -static inline void g3_check_and_draw_tmap(const array &pointlist, const array &uvl_list, const array &light_rgb, grs_bitmap &bm) +static inline void g3_check_and_draw_tmap(grs_canvas &canvas, const array &pointlist, const array &uvl_list, const array &light_rgb, grs_bitmap &bm) { - g3_check_and_draw_tmap(N, pointlist, uvl_list, light_rgb, bm); + g3_check_and_draw_tmap(canvas, N, pointlist, uvl_list, light_rgb, bm); } //draws a line. takes two points. diff --git a/similar/main/terrain.cpp b/similar/main/terrain.cpp index 9cf2910d6..d490f9305 100644 --- a/similar/main/terrain.cpp +++ b/similar/main/terrain.cpp @@ -86,7 +86,7 @@ static void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_ uvl_list1[1].u = (i)*f1_0/4; uvl_list1[1].v = (j+1)*f1_0/4; uvl_list1[2].u = (i+1)*f1_0/4; uvl_list1[2].v = (j)*f1_0/4; - g3_check_and_draw_tmap(pointlist,uvl_list1,lrgb_list1,*terrain_bm); + g3_check_and_draw_tmap(*grd_curcanv, pointlist, uvl_list1, lrgb_list1, *terrain_bm); if (terrain_outline) { int lsave=Lighting_on; Lighting_on=0; @@ -108,7 +108,7 @@ static void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_ uvl_list2[1].u = (i+1)*f1_0/4; uvl_list2[1].v = (j+1)*f1_0/4; uvl_list2[2].u = (i+1)*f1_0/4; uvl_list2[2].v = (j)*f1_0/4; - g3_check_and_draw_tmap(pointlist,uvl_list2,lrgb_list2,*terrain_bm); + g3_check_and_draw_tmap(*grd_curcanv, pointlist, uvl_list2, lrgb_list2, *terrain_bm); if (terrain_outline) { int lsave=Lighting_on; Lighting_on=0;