From ca123b6cde8d3084eee322b75e9f4dd76dd8ce7a Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 2 Apr 2015 02:36:54 +0000 Subject: [PATCH] Remove unused gr_line return value --- common/2d/line.cpp | 9 ++------- common/include/3d.h | 2 +- common/include/gr.h | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/common/2d/line.cpp b/common/2d/line.cpp index 9f1428821..72316b140 100644 --- a/common/2d/line.cpp +++ b/common/2d/line.cpp @@ -284,20 +284,15 @@ int gr_uline(fix _a1, fix _b1, fix _a2, fix _b2) // Returns 0 if drawn with no clipping, 1 if drawn but clipped, and // 2 if not drawn at all. -int gr_line(fix a1, fix b1, fix a2, fix b2) +void gr_line(fix a1, fix b1, fix a2, fix b2) { int x1, y1, x2, y2; - int clipped=0; - x1 = i2f(MINX); y1 = i2f(MINY); x2 = i2f(MAXX); y2 = i2f(MAXY); - CLIPLINE(a1,b1,a2,b2,x1,y1,x2,y2,return 2,clipped=1, FIXSCALE ); + CLIPLINE(a1,b1,a2,b2,x1,y1,x2,y2,return,, FIXSCALE ); gr_uline( a1, b1, a2, b2 ); - - return clipped; - } diff --git a/common/include/3d.h b/common/include/3d.h index 3e212a327..a27bcd80b 100644 --- a/common/include/3d.h +++ b/common/include/3d.h @@ -312,7 +312,7 @@ constexpr std::size_t MAX_POINTS_IN_POLY = 100; typedef void (*tmap_drawer_type)(const grs_bitmap &bm,uint_fast32_t nv,const g3s_point *const *vertlist); typedef void (*flat_drawer_type)(uint_fast32_t nv,const array &vertlist); -typedef int (*line_drawer_type)(fix x0,fix y0,fix x1,fix y1); +typedef void (*line_drawer_type)(fix x0,fix y0,fix x1,fix y1); // This is the gr_upoly-like interface to the texture mapper which uses texture-mapper compatible // (ie, avoids cracking) edge/delta computation. diff --git a/common/include/gr.h b/common/include/gr.h index 0ba81a919..f72d7e114 100644 --- a/common/include/gr.h +++ b/common/include/gr.h @@ -323,7 +323,7 @@ unsigned char gr_gpixel(const grs_bitmap &bitmap, int x, int y ); unsigned char gr_ugpixel(const grs_bitmap &bitmap, int x, int y ); // Draws a line into the current canvas in the current color and drawmode. -int gr_line(fix x0,fix y0,fix x1,fix y1); +void gr_line(fix x0,fix y0,fix x1,fix y1); int gr_uline(fix x0,fix y0,fix x1,fix y1); // Draw the bitmap into the current canvas at the specified location.