From 756caede514eaef92842340039b759b71251da95 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 5 Oct 2020 18:32:16 +0200 Subject: [PATCH] - fixed misnamed variable and removed restriction for draw pass in GetFullscreenRect. --- src/common/2d/v_draw.cpp | 2 -- wadsrc/static/zscript/ui/menu/listmenu.zs | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/2d/v_draw.cpp b/src/common/2d/v_draw.cpp index 86a85c55cd..c7dcd83d4c 100644 --- a/src/common/2d/v_draw.cpp +++ b/src/common/2d/v_draw.cpp @@ -417,8 +417,6 @@ DEFINE_ACTION_FUNCTION(_Screen, GetFullscreenRect) PARAM_FLOAT(virth); PARAM_INT(fsmode); - if (!twod->HasBegun2D()) ThrowAbortException(X_OTHER, "Attempt to draw to screen outside a draw function"); - DrawParms parms; DoubleRect rect; parms.viewport.width = twod->GetWidth(); diff --git a/wadsrc/static/zscript/ui/menu/listmenu.zs b/wadsrc/static/zscript/ui/menu/listmenu.zs index f17a662748..74efc6bd45 100644 --- a/wadsrc/static/zscript/ui/menu/listmenu.zs +++ b/wadsrc/static/zscript/ui/menu/listmenu.zs @@ -191,7 +191,7 @@ class ListMenu : Menu { int sel = -1; - int w = desc.DisplayWidth(); + int w = mDesc.DisplayWidth(); double sx, sy; if (w == ListMenuDescriptor.CleanScale) { @@ -202,7 +202,7 @@ class ListMenu : Menu else { // for fullscreen scale, transform coordinates so that for the given rect the coordinates are within (0, 0, w, h) - int h = desc.DisplayHeight(); + int h = mDesc.DisplayHeight(); double fx, fy, fw, fh; [fx, fy, fw, fh] = Screen.GetFullscreenRect(w, h, FSMode_ScaleToFit43);