From 493ff5f089b578bec17b324a6c8ffa97c700cb52 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 3 Dec 2018 13:38:18 -0500 Subject: [PATCH] - always apply vid_scalefactor now, even when vid_scalemode is not 0 or 1. --- src/r_videoscale.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/r_videoscale.cpp b/src/r_videoscale.cpp index 420d2fc8b..0981c01d7 100644 --- a/src/r_videoscale.cpp +++ b/src/r_videoscale.cpp @@ -113,7 +113,7 @@ int ViewportScaledWidth(int width, int height) vid_scalemode = 0; if (vid_cropaspect && height > 0) width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width; - return (int)MAX((int32_t)320, (int32_t)vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor))); + return (int)MAX((int32_t)320, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledWidth(width))); } int ViewportScaledHeight(int width, int height) @@ -122,7 +122,7 @@ int ViewportScaledHeight(int width, int height) vid_scalemode = 0; if (vid_cropaspect && height > 0) height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height; - return (int)MAX((int32_t)200, (int32_t)vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor))); + return (int)MAX((int32_t)200, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledHeight(height))); } bool ViewportIsScaled43()