From bc721dbc8f31c3588b27e9e5f9cd24227f8829e1 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 12 Aug 2014 02:58:46 +0000 Subject: [PATCH] Remove unused g3_draw_rod_tmap return value --- common/3d/rod.cpp | 18 +++--------------- common/include/3d.h | 6 +----- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/common/3d/rod.cpp b/common/3d/rod.cpp index 24f1de8be..b514fff0c 100644 --- a/common/3d/rod.cpp +++ b/common/3d/rod.cpp @@ -96,25 +96,13 @@ static int calc_rod_corners(rod_4point &rod_point_group, g3s_point *bot_point,fi return 0; } -//draw a polygon that is always facing you -//returns 1 if off screen, 0 if drew -bool g3_draw_rod_flat(g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width) -{ - rod_4point rod; - if (calc_rod_corners(rod,bot_point,bot_width,top_point,top_width)) - return 0; - - return g3_draw_poly(4,rod.point_list); - -} - //draw a bitmap object that is always facing you //returns 1 if off screen, 0 if drew -bool g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width,g3s_lrgb light) +void g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width,g3s_lrgb light) { rod_4point rod; if (calc_rod_corners(rod,bot_point,bot_width,top_point,top_width)) - return 0; + return; g3s_uvl uvl_list[4] = { { 0x0200,0x0200,0 }, @@ -130,7 +118,7 @@ bool g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_ light, }; - return g3_draw_tmap(4,rod.point_list,uvl_list,lrgb_list,bitmap); + g3_draw_tmap(4,rod.point_list,uvl_list,lrgb_list,bitmap); } #ifndef OGL diff --git a/common/include/3d.h b/common/include/3d.h index e1808f970..05efc61b7 100644 --- a/common/include/3d.h +++ b/common/include/3d.h @@ -198,13 +198,9 @@ void g3_check_and_draw_tmap(int nv,g3s_point **pointlist,const g3s_uvl *uvl_list //draws a line. takes two points. bool g3_draw_line(g3s_point *p0,g3s_point *p1); -//draw a polygon that is always facing you -//returns 1 if off screen, 0 if drew -bool g3_draw_rod_flat(g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width); - //draw a bitmap object that is always facing you //returns 1 if off screen, 0 if drew -bool g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width,g3s_lrgb light); +void g3_draw_rod_tmap(grs_bitmap *bitmap,g3s_point *bot_point,fix bot_width,g3s_point *top_point,fix top_width,g3s_lrgb light); //draws a bitmap with the specified 3d width & height //returns 1 if off screen, 0 if drew