From 77d3cf508de0fc880b8d0289ed0af6855de79467 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Jan 2020 17:59:25 -0800 Subject: [PATCH] Correct V_LockBlend dimensions --- src/st_stuff.c | 8 ++++---- src/v_video.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 5fc6b4f74..6fa44c41b 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -990,6 +990,10 @@ static void ST_drawInput(void) return; flags |= V_HUDTRANS|V_PERPLAYER; + + ///V_TestBatch(); + /* I'm a lazy shit so these stay magic. haha... */ + V_LockBlend(14, 148, 43, 22, flags); } if (stplyr->powers[pw_carry] == CR_NIGHTSMODE) @@ -998,10 +1002,6 @@ static void ST_drawInput(void) if (F_GetPromptHideHud(y)) return; - //V_TestBatch(); - /* I'm a lazy shit so these stay magic. haha... */ - V_LockBlend(88, 172, 43, 22, flags); - // O backing V_DrawFillMaybeFade(x, y-1, 16, 16, hudinfo[HUD_LIVES].f|flags|20, translucency); V_DrawFillMaybeFade(x, y+15, 16, 1, hudinfo[HUD_LIVES].f|flags|29, translucency); diff --git a/src/v_video.c b/src/v_video.c index 7563d4e3c..963344197 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -1011,6 +1011,10 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca else pwidth = SHORT(patch->width) * dupx; +#ifdef BATCHTEST + Vstatbatch(x, y, pwidth, dupy * (( pscale * SHORT (patch->height) )>>FRACBITS )); +#endif + deststart = desttop; destend = desttop + pwidth; @@ -1550,6 +1554,10 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c) if (y + h > vid.height) h = vid.height - y; +#ifdef BATCHTEST + Vstatbatch(x, y, w, h); +#endif + dest = screens[0] + y*vid.width + x; deststop = screens[0] + vid.rowbytes * vid.height; @@ -1946,6 +1954,10 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U if (y + h > vid.height) h = vid.height-y; +#ifdef BATCHTEST + Vstatbatch(x, y, w, h); +#endif + x = y * vid.width + x; dest = screens[0] + x;