zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch from Fox to fix positioning of SCUBAMASK tile with the full status bar

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7332 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-02-18 22:02:46 +00:00
parent 180c73d8ca
commit af83ff0675
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/duke3d/src/player.cpp
View file

@ -2019,6 +2019,10 @@ void P_DisplayScuba(void)
return; return;
int const scubaPal = P_GetHudPal(pPlayer); int const scubaPal = P_GetHudPal(pPlayer);
int scubaY = 200 - tilesiz[SCUBAMASK].y;
if (ud.screen_size > 4 && ud.statusbarmode == 0)
// Scale the offset of 8px with the status bar, otherwise the bottom of the tile is cut
scubaY -= scale(8, ud.statusbarscale, 100);
#ifdef SPLITSCREEN_MOD_HACKS #ifdef SPLITSCREEN_MOD_HACKS
g_snum = screenpeek; g_snum = screenpeek;
@ -2027,10 +2031,10 @@ void P_DisplayScuba(void)
// this is a hack to hide the seam that appears between the two halves of the mask in GL // this is a hack to hide the seam that appears between the two halves of the mask in GL
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (videoGetRenderMode() >= REND_POLYMOST) if (videoGetRenderMode() >= REND_POLYMOST)
G_DrawTileScaled(44, (200 - tilesiz[SCUBAMASK].y), SCUBAMASK, 0, 2 + 16 + DRAWEAP_CENTER, scubaPal); G_DrawTileScaled(44, scubaY, SCUBAMASK, 0, 2 + 16 + DRAWEAP_CENTER, scubaPal);
#endif #endif
G_DrawTileScaled(43, (200 - tilesiz[SCUBAMASK].y), SCUBAMASK, 0, 2 + 16 + DRAWEAP_CENTER, scubaPal); G_DrawTileScaled(43, scubaY, SCUBAMASK, 0, 2 + 16 + DRAWEAP_CENTER, scubaPal);
G_DrawTileScaled(320 - 43, (200 - tilesiz[SCUBAMASK].y), SCUBAMASK, 0, 2 + 4 + 16 + DRAWEAP_CENTER, scubaPal); G_DrawTileScaled(320 - 43, scubaY, SCUBAMASK, 0, 2 + 4 + 16 + DRAWEAP_CENTER, scubaPal);
} }
} }