Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-25 03:42:34 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src_rebuild/Game/C/main.c
View File

@ -2318,7 +2318,7 @@ void RenderGame2(int view)
colour = 32 - colour; colour = 32 - colour;
SetTextColour((colour & 0x1f) << 3, 0, 0); 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++) for (i = 0; i < 2; i++)

2
src_rebuild/Game/C/mdraw.c
View File

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

42
src_rebuild/Game/C/overlay.c
View File

@ -675,6 +675,27 @@ void DisplayOverlays(void)
{ {
short* felony; 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) if (NoPlayerControl || gInGameCutsceneActive || gInGameCutsceneDelay)
return; return;
@ -695,27 +716,6 @@ void DisplayOverlays(void)
if (!gDoOverlays) if (!gDoOverlays)
return; 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) if(!gInvincibleCar || ActiveCheats.cheat3)
{ {
DrawPercentageBar(&PlayerDamageBar); DrawPercentageBar(&PlayerDamageBar);