From 778a2b1dc7a8b60a0feaba997212973d7d1ba31a Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Sat, 10 Nov 2018 15:55:09 +0000 Subject: [PATCH] Whoops, mucked up this part of the conflict resolving --- src/hardware/hw_draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index a817e1f90..294e6bcd0 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -324,7 +324,7 @@ void HWR_DrawFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, if (pscale != FRACUNIT || (splitscreen && option & V_PERPLAYER)) { fwidth = (float)SHORT(gpatch->width) * fscalew * dupx; - fheight = (float)SHORT(gpatch->height) * fscalew * dupy; + fheight = (float)SHORT(gpatch->height) * fscaleh * dupy; } else {