From cc8bed5b95361865aef4905f06e3de2aeccfe341 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 12 Feb 2016 04:02:28 +0000 Subject: [PATCH] Pass color to draw_side_edge --- similar/editor/meddraw.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/similar/editor/meddraw.cpp b/similar/editor/meddraw.cpp index ed2078f1b..31965e466 100644 --- a/similar/editor/meddraw.cpp +++ b/similar/editor/meddraw.cpp @@ -184,12 +184,11 @@ static void draw_seg_side(const vcsegptr_t seg, int side, const uint8_t color) } } -static void draw_side_edge(const vcsegptr_t seg,int side,int edge) +static void draw_side_edge(const vcsegptr_t seg,int side,int edge, const uint8_t color) { auto &svp = seg->verts; if (!rotate_list(svp).uand) //on screen? { - const auto color = grd_curcanv->cv_color; auto &stv = Side_to_verts[side]; draw_line(svp[stv[edge]], svp[stv[(edge + 1) % 4]], color); } @@ -820,9 +819,7 @@ void draw_world(grs_canvas *screen_canvas,editor_view *v,const vsegptridx_t mine draw_segment(Cursegp, CURSEG_COLOR); draw_seg_side(Cursegp,Curside, CURSIDE_COLOR); - - gr_setcolor(CUREDGE_COLOR); - draw_side_edge(Cursegp,Curside,Curedge); + draw_side_edge(Cursegp,Curside,Curedge, CUREDGE_COLOR); // Draw coordinate axes if we are rendering the large view. if (Show_axes_flag)