From bc3947b64399dc5f239abd80c5efa127c26f98ee Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 6 May 2020 05:50:00 -0400 Subject: [PATCH] - inter_classic_scaling now defaults to true - fixed: last commit I accidentally left hardcoded testing values and did not change them back to check for the texture's original size --- src/common/2d/v_2ddrawer.cpp | 4 ++-- src/intermission/intermission.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/2d/v_2ddrawer.cpp b/src/common/2d/v_2ddrawer.cpp index 59765daa7a..7b161c06af 100644 --- a/src/common/2d/v_2ddrawer.cpp +++ b/src/common/2d/v_2ddrawer.cpp @@ -757,8 +757,8 @@ void F2DDrawer::AddFlatFill(int left, int top, int right, int bottom, FGameTextu float ar = 4.f / 3.f / (float)ActiveRatio((float)screen->GetWidth(), (float)screen->GetHeight()); fU1 = 0.f; fV1 = 0.f; - fU2 = 320.f / 64.f * fs / ar; - fV2 = 200.f / 64.f * fs; + fU2 = 320.f / (float)src->GetDisplayWidth() * fs / ar; + fV2 = 200.f / (float)src->GetDisplayHeight() * fs; break; } dg.mVertIndex = (int)mVertices.Reserve(4); diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 0e03cef95a..26a7958d7b 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -73,7 +73,7 @@ extern int NoWipe; CVAR(Bool, nointerscrollabort, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, inter_subtitles, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); -CVAR(Bool, inter_classic_scaling, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); +CVAR(Bool, inter_classic_scaling, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); //========================================================================== //