stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct V_LockBlend dimensions

Browse source
This commit is contained in:
James R 2020-01-03 17:59:25 -08:00
parent 95ce17ee60
commit 77d3cf508d
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/st_stuff.c
View file

@ -990,6 +990,10 @@ static void ST_drawInput(void)
return; return;
flags |= V_HUDTRANS|V_PERPLAYER; 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) if (stplyr->powers[pw_carry] == CR_NIGHTSMODE)
@ -998,10 +1002,6 @@ static void ST_drawInput(void)
if (F_GetPromptHideHud(y)) if (F_GetPromptHideHud(y))
return; return;
//V_TestBatch();
/* I'm a lazy shit so these stay magic. haha... */
V_LockBlend(88, 172, 43, 22, flags);
// O backing // O backing
V_DrawFillMaybeFade(x, y-1, 16, 16, hudinfo[HUD_LIVES].f|flags|20, translucency); 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); V_DrawFillMaybeFade(x, y+15, 16, 1, hudinfo[HUD_LIVES].f|flags|29, translucency);

12
src/v_video.c
View file

@ -1011,6 +1011,10 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
else else
pwidth = SHORT(patch->width) * dupx; pwidth = SHORT(patch->width) * dupx;
#ifdef BATCHTEST
Vstatbatch(x, y, pwidth, dupy * (( pscale * SHORT (patch->height) )>>FRACBITS ));
#endif
deststart = desttop; deststart = desttop;
destend = desttop + pwidth; 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) if (y + h > vid.height)
h = vid.height - y; h = vid.height - y;
#ifdef BATCHTEST
Vstatbatch(x, y, w, h);
#endif
dest = screens[0] + y*vid.width + x; dest = screens[0] + y*vid.width + x;
deststop = screens[0] + vid.rowbytes * vid.height; 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) if (y + h > vid.height)
h = vid.height-y; h = vid.height-y;
#ifdef BATCHTEST
Vstatbatch(x, y, w, h);
#endif
x = y * vid.width + x; x = y * vid.width + x;
dest = screens[0] + x; dest = screens[0] + x;