From 2898b6d81f34e1946245088bb473a572269fe841 Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Mon, 15 Jan 2018 21:02:33 +0000 Subject: [PATCH] Our quit screen is 640x400 There's a small fix for V_DrawFixedPatch that makes it account for scale when blacking out the rest of the screen, for when scale is 50% or 25%, but can theoretically work with any scale --- src/m_menu.c | 2 +- src/v_video.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 2c2a237a7..726056892 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7855,7 +7855,7 @@ void M_QuitResponse(INT32 ch) ptime = I_GetTime() + NEWTICRATE*2; // Shortened the quit time, used to be 2 seconds Tails 03-26-2001 while (ptime > I_GetTime()) { - V_DrawScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_CACHE)); // Demo 3 Quit Screen Tails 06-16-2001 + V_DrawSmallScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_CACHE)); // Demo 3 Quit Screen Tails 06-16-2001 I_FinishUpdate(); // Update the screen with the image Tails 06-19-2001 I_Sleep(); } diff --git a/src/v_video.c b/src/v_video.c index 6a8036890..5f5335967 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -476,7 +476,8 @@ void V_DrawFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2; } // if it's meant to cover the whole screen, black out the rest - if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT) + if (x == 0 && FixedMul(SHORT(patch->width)<>FRACBITS == BASEVIDWIDTH + && y == 0 && FixedMul(SHORT(patch->height)<>FRACBITS == BASEVIDHEIGHT) { column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0])); source = (const UINT8 *)(column) + 3;