From ad6606335486fdc9a27becf477e7f3bb87afd4fb Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 31 Jan 2021 06:24:43 -0500 Subject: [PATCH] - oops this was not supposed to be in master Revert "- failed attempt at automap line thickness" This reverts commit 9651dd3a48806771ab3782036603a2e56262ce46. --- src/common/2d/v_draw.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/common/2d/v_draw.cpp b/src/common/2d/v_draw.cpp index 8c4d9fe71..70bf53042 100644 --- a/src/common/2d/v_draw.cpp +++ b/src/common/2d/v_draw.cpp @@ -41,7 +41,6 @@ #include "r_videoscale.h" #include "c_cvars.h" -CVAR (Int, ui_linethickness, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) EXTERN_CVAR(Int, vid_aspect) EXTERN_CVAR(Int, uiscale) CVAR(Bool, ui_screenborder_classic_scaling, true, CVAR_ARCHIVE) @@ -1352,19 +1351,7 @@ void VirtualToRealCoordsInt(F2DDrawer *drawer, int &x, int &y, int &w, int &h, static void DrawLine(int x0, int y0, int x1, int y1, uint32_t realcolor, int alpha) { if (!twod->HasBegun2D()) ThrowAbortException(X_OTHER, "Attempt to draw to screen outside a draw function"); - if (ui_linethickness) - { - int i1, i2; - for (i2 = -ui_linethickness; i2 < ui_linethickness; i2++) - { - for (i1 = -ui_linethickness; i1 < ui_linethickness; i1++) - { - twod->AddLine((float)(x0 + i1), (float)(y0 + i2), (float)(x1 + i1), (float)(y1 + i2), -1, -1, INT_MAX, INT_MAX, realcolor | MAKEARGB(255, 0, 0, 0), alpha); - } - } - } - else - twod->AddLine((float)x0, (float)y0, (float)x1, (float)y1, -1, -1, INT_MAX, INT_MAX, realcolor | MAKEARGB(255, 0, 0, 0), alpha); + twod->AddLine((float)x0, (float)y0, (float)x1, (float)y1, -1, -1, INT_MAX, INT_MAX, realcolor | MAKEARGB(255, 0, 0, 0), alpha); } DEFINE_ACTION_FUNCTION_NATIVE(_Screen, DrawLine, DrawLine)