- fix "Out of Tape" height, align DEMO text

This commit is contained in:
Ilya Shurumov 2022-02-04 10:43:11 +03:00
parent 583cae8b56
commit 4086bbaf9c
3 changed files with 23 additions and 23 deletions

View File

@ -2318,7 +2318,7 @@ void RenderGame2(int view)
colour = 32 - colour;
SetTextColour((colour & 0x1f) << 3, 0, 0);
PrintString(G_LTXT(GTXT_DEMO), 32, 15);
PrintString(G_LTXT(GTXT_DEMO), gOverlayXPos, 15);
}
for (i = 0; i < 2; i++)

View File

@ -131,7 +131,7 @@ void DrawMission(void)
if (gOutOfTape)
{
SetTextColour(128, 128, 64);
PrintString(G_LTXT(GTXT_OutOfTape), gOverlayXPos, 236);
PrintString(G_LTXT(GTXT_OutOfTape), gOverlayXPos, SCREEN_H - 20);
}
}
}

View File

@ -675,6 +675,27 @@ void DisplayOverlays(void)
{
short* felony;
#ifndef PSX
if (gWidescreenOverlayAlign)
{
// align to PSX-mapped screen coordinates
RECT16 emuViewport;
PsyX_GetPSXWidescreenMappedViewport(&emuViewport);
// recalc pos
gOverlayXPos = 16 + emuViewport.x;
gOverlayXOppPos = emuViewport.w - 16 - PERCENTAGE_BAR_WIDTH;
gMapXOffset = emuViewport.w - 16 - MAP_SIZE_W;
// set up
PlayerDamageBar.xpos = gOverlayXPos;
Player2DamageBar.xpos = gOverlayXPos;
FelonyBar.xpos = gOverlayXPos;
DamageBar.xpos = gOverlayXOppPos;
ProxyBar.xpos = gOverlayXPos;
}
#endif
if (NoPlayerControl || gInGameCutsceneActive || gInGameCutsceneDelay)
return;
@ -695,27 +716,6 @@ void DisplayOverlays(void)
if (!gDoOverlays)
return;
#ifndef PSX
if (gWidescreenOverlayAlign)
{
// align to PSX-mapped screen coordinates
RECT16 emuViewport;
PsyX_GetPSXWidescreenMappedViewport(&emuViewport);
// recalc pos
gOverlayXPos = 16 + emuViewport.x;
gOverlayXOppPos = emuViewport.w - 16 - PERCENTAGE_BAR_WIDTH;
gMapXOffset = emuViewport.w - 16 - MAP_SIZE_W;
// set up
PlayerDamageBar.xpos = gOverlayXPos;
Player2DamageBar.xpos = gOverlayXPos;
FelonyBar.xpos = gOverlayXPos;
DamageBar.xpos = gOverlayXOppPos;
ProxyBar.xpos = gOverlayXPos;
}
#endif
if(!gInvincibleCar || ActiveCheats.cheat3)
{
DrawPercentageBar(&PlayerDamageBar);