From 03640a16ea4a172a51a33475e879d419b58ddb2a Mon Sep 17 00:00:00 2001 From: Jonathan Russell Date: Thu, 3 Aug 2017 02:09:48 +0100 Subject: [PATCH] - removed ZScript DrawLine palcolor arg --- src/v_draw.cpp | 3 +-- wadsrc/static/zscript/base.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/v_draw.cpp b/src/v_draw.cpp index 9b78c5054d..accded5576 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -966,9 +966,8 @@ DEFINE_ACTION_FUNCTION(_Screen, DrawLine) PARAM_INT(x1); PARAM_INT(y1); PARAM_INT(color); - PARAM_INT_DEF(palcol); if (!screen->HasBegun2D()) ThrowAbortException(X_OTHER, "Attempt to draw to screen outside a draw function"); - screen->DrawLine(x0, y0, x1, y1, palcol, color); + screen->DrawLine(x0, y0, x1, y1, -1, color); return 0; } diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index f8c7134534..9c21916c55 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -167,7 +167,7 @@ struct Screen native native static vararg void DrawTexture(TextureID tex, bool animate, double x, double y, ...); native static vararg void DrawChar(Font font, int normalcolor, double x, double y, int character, ...); native static vararg void DrawText(Font font, int normalcolor, double x, double y, String text, ...); - native static void DrawLine(int x0, int y0, int x1, int y1, Color color, int palcolor = -1); + native static void DrawLine(int x0, int y0, int x1, int y1, Color color); native static void DrawFrame(int x, int y, int w, int h); native static Vector2, Vector2 VirtualToRealCoords(Vector2 pos, Vector2 size, Vector2 vsize, bool vbottom=false, bool handleaspect=true); native static double GetAspectRatio();