summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-06 20:31:34 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-06 20:31:34 +0200
commit32c5723b91fd6745e524ebd0589cb9acd921ab4c (patch)
tree3d94a842aad06f25a1a33d528c000da5c99c64c7
parentCGarages::PrintMessages drawing fixes (diff)
downloadre3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar.gz
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar.bz2
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar.lz
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar.xz
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.tar.zst
re3-32c5723b91fd6745e524ebd0589cb9acd921ab4c.zip
-rw-r--r--src/audio/MusicManager.cpp2
-rw-r--r--src/render/Hud.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index ce554ab4..01a21d5d 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -162,7 +162,7 @@ void cMusicManager::DisplayRadioStationName()
CFont::SetCentreOn();
CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
CFont::SetColor(CRGBA(0, 0, 0, 255));
- CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_SCALE_Y(23.0f), pCurrentStation);
+ CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);
if (gNumRetunePresses)
CFont::SetColor(CRGBA(102, 133, 143, 255));
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 4ef976e9..d6a5c7be 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -134,7 +134,7 @@ void CHud::Draw()
/*
Draw Crosshairs
*/
- if (TheCamera.Cams->Using3rdPersonMouseCam() && (!CPad::GetPad(0)->GetLookBehindForPed() || TheCamera.m_bPlayerIsInGarage) || Mode == 40) {
+ if (TheCamera.Cams->Using3rdPersonMouseCam() && (!CPad::GetPad(0)->GetLookBehindForPed() || TheCamera.m_bPlayerIsInGarage) || Mode == CCam::MODE_FIRSTPERSONPEDONPC_40) {
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed) {
int32 State = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_nPedState;
if (State != PED_ENTER_CAR && State != PED_CARJACK) {
@@ -1137,10 +1137,10 @@ void CHud::DrawAfterFade()
CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::SetFontStyle(FONT_BANK);
- CFont::PrintString((SCREEN_WIDTH / 2) - SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) - SCREEN_SCALE_Y(2.0f), m_BigMessage[3]);
+ CFont::PrintString((SCREEN_WIDTH / 2) - SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) - SCREEN_SCALE_Y(2.0f), m_BigMessage[4]);
CFont::SetColor(CRGBA(89, 115, 150, 255));
- CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f), m_BigMessage[3]);
+ CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f), m_BigMessage[4]);
}
// Oddjob result