mirror of
https://github.com/OpenDriver2/REDRIVER2.git
synced 2024-11-24 19:32:50 +01:00
- correct damage bar, pause menu & messages for NTSC
This commit is contained in:
parent
2e02105380
commit
64475d3352
@ -14,6 +14,7 @@
|
|||||||
#include "dr2roads.h"
|
#include "dr2roads.h"
|
||||||
#include "cars.h"
|
#include "cars.h"
|
||||||
#include "targets.h"
|
#include "targets.h"
|
||||||
|
#include "system.h"
|
||||||
|
|
||||||
int gDisplayPosition = 0;
|
int gDisplayPosition = 0;
|
||||||
|
|
||||||
@ -98,8 +99,8 @@ void DrawMission(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PrintScaledString(64, string, 32 - (g321GoDelay & 0x1f));
|
PrintScaledString(SCREEN_H / 4, string, 32 - (g321GoDelay & 0x1f));
|
||||||
PrintScaledString(192, string, 32 - (g321GoDelay & 0x1f));
|
PrintScaledString(SCREEN_H / 2 + SCREEN_H / 4, string, 32 - (g321GoDelay & 0x1f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!pauseflag)
|
else if (!pauseflag)
|
||||||
@ -109,11 +110,11 @@ void DrawMission(void)
|
|||||||
if (NumPlayers == 1)
|
if (NumPlayers == 1)
|
||||||
DrawMessage(96, Mission.message_string[0]);
|
DrawMessage(96, Mission.message_string[0]);
|
||||||
else
|
else
|
||||||
DrawMessage(64, Mission.message_string[0]);
|
DrawMessage(SCREEN_H / 4, Mission.message_string[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Mission.message_timer[1] != 0)
|
if (Mission.message_timer[1] != 0)
|
||||||
DrawMessage(192, Mission.message_string[1]);
|
DrawMessage(SCREEN_H / 2 + SCREEN_H / 4, Mission.message_string[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Mission.active && !NoPlayerControl)
|
if (Mission.active && !NoPlayerControl)
|
||||||
|
@ -87,7 +87,7 @@ void InitOverlays(void)
|
|||||||
{
|
{
|
||||||
InitPercentageBar(&Player2DamageBar, MaxPlayerDamage[1], playerDamageColour, G_LTXT(GTXT_Damage));
|
InitPercentageBar(&Player2DamageBar, MaxPlayerDamage[1], playerDamageColour, G_LTXT(GTXT_Damage));
|
||||||
Player2DamageBar.xpos = gOverlayXPos;
|
Player2DamageBar.xpos = gOverlayXPos;
|
||||||
Player2DamageBar.ypos = 140;
|
Player2DamageBar.ypos = SCREEN_H / 2 + 12;
|
||||||
Player2DamageBar.active = 1;
|
Player2DamageBar.active = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -854,7 +854,7 @@ void SetupMenu(MENU_HEADER *menu, int back)
|
|||||||
|
|
||||||
ActiveMenu->Bound.x = ((304 - len) / 2) - 4;
|
ActiveMenu->Bound.x = ((304 - len) / 2) - 4;
|
||||||
ActiveMenu->Bound.w = len + 24;
|
ActiveMenu->Bound.w = len + 24;
|
||||||
ActiveMenu->Bound.y = MAX(48, ((numItems + 1) * -15 + 256) / 2);
|
ActiveMenu->Bound.y = MAX(48, (SCREEN_H - (numItems + 1) * 15) / 2);
|
||||||
ActiveMenu->Bound.h = (numItems + 1) * 15 + 10;
|
ActiveMenu->Bound.h = (numItems + 1) * 15 + 10;
|
||||||
|
|
||||||
ActiveItem[VisibleMenu] = &ActiveMenu->MenuItems[ActiveMenuItem];
|
ActiveItem[VisibleMenu] = &ActiveMenu->MenuItems[ActiveMenuItem];
|
||||||
|
Loading…
Reference in New Issue
Block a user