From 2ce7bcc405daf1b01f9220e7b584bc7c318ec5cd Mon Sep 17 00:00:00 2001
From: _AG <gennariarmando@outlook.com>
Date: Thu, 20 Jun 2019 02:31:03 +0200
Subject: Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h.

---
 src/control/Garages.cpp | 16 ++++++++--------
 src/control/Script.cpp  |  4 ++++
 src/control/Script.h    |  5 +++++
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/control')

diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index b8469e5f..6f1ad028 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -68,40 +68,40 @@ CGarages::IsModelIndexADoor(uint32 id)
 void CGarages::PrintMessages()
 {
 	if (CTimer::GetTimeInMilliseconds() > CGarages::MessageStartTime && CTimer::GetTimeInMilliseconds() < CGarages::MessageEndTime) {
-		CFont::SetScale(HUD_STRETCH_X(1.2f / 2), HUD_STRETCH_Y(1.5f / 2)); // BUG: game doesn't use macro here.
+		CFont::SetScale(SCREEN_SCALE_X(1.2f / 2), SCREEN_SCALE_Y(1.5f / 2)); // BUG: game doesn't use macro here.
 		CFont::SetPropOn();
 		CFont::SetJustifyOff();
 		CFont::SetBackgroundOff();
-		CFont::SetCentreSize(HUD_FROM_RIGHT(50.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(50.0f));
 		CFont::SetCentreOn();
 		CFont::SetFontStyle(FONT_BANK);
 
 		if (CGarages::MessageNumberInString2 < 0) {
 			if (CGarages::MessageNumberInString < 0) {
 				CFont::SetColor(CRGBA(0, 0, 0, 255));
-				CFont::PrintString((SCREEN_WIDTH/ 2) + HUD_STRETCH_X(2.0f), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f), TheText.Get(CGarages::MessageIDString));
+				CFont::PrintString((SCREEN_WIDTH/ 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f), TheText.Get(CGarages::MessageIDString));
 
 				CFont::SetColor(CRGBA(89, 115, 150, 255));
-				CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f), TheText.Get(CGarages::MessageIDString));
+				CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f), TheText.Get(CGarages::MessageIDString));
 			}
 			else {
 				CMessages::InsertNumberInString(TheText.Get(CGarages::MessageIDString), CGarages::MessageNumberInString, -1, -1, -1, -1, -1, gUString);
 
 				CFont::SetColor(CRGBA(0, 0, 0, 255));
-				CFont::PrintString((SCREEN_WIDTH / 2) + HUD_STRETCH_X(2.0f), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f + 2.0 - 40.0f), gUString);
+				CFont::PrintString((SCREEN_WIDTH / 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f + 2.0 - 40.0f), gUString);
 
 				CFont::SetColor(CRGBA(89, 115, 150, 255));
-				CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f - 40.0f), gUString);
+				CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f - 40.0f), gUString);
 			}
 		}
 		else {
 			CMessages::InsertNumberInString(TheText.Get(CGarages::MessageIDString), CGarages::MessageNumberInString2, -1, -1, -1, -1, -1, gUString);
 
 			CFont::SetColor(CRGBA(0, 0, 0, 255));
-			CFont::PrintString((SCREEN_WIDTH / 2) + HUD_STRETCH_X(2.0f), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f + 2.0 - 40.0f), gUString);
+			CFont::PrintString((SCREEN_WIDTH / 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f + 2.0 - 40.0f), gUString);
 
 			CFont::SetColor(CRGBA(89, 115, 150, 255));
-			CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + HUD_STRETCH_Y(-84.0f - 40.0f), gUString);
+			CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f - 40.0f), gUString);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 7cea978f..68212e2c 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -7,3 +7,7 @@ uint8 *CTheScripts::ScriptSpace = (uint8*)0x74B248;
 CTextLine* CTheScripts::IntroTextLines = (CTextLine*)0x70EA74;
 CScriptRectangle* CTheScripts::IntroRectangles = (CScriptRectangle*)0x72D109;
 CSprite2d* CTheScripts::ScriptSprites = (CSprite2d*)0x72B090;
+bool CTheScripts::DbgFlag = *(bool*)0x95CD87;
+uint32 CTheScripts::OnAMissionFlag = *(uint32*)0x8F1B64;
+
+WRAPPER bool CTheScripts::IsPlayerOnAMission() { EAXJMP(0x439410); }
diff --git a/src/control/Script.h b/src/control/Script.h
index cdc33e97..cf428855 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -39,4 +39,9 @@ public:
 	static CTextLine* IntroTextLines;
 	static CScriptRectangle* IntroRectangles;
 	static CSprite2d* ScriptSprites;
+	static bool DbgFlag;
+	static uint32 OnAMissionFlag;
+
+public:
+	static bool IsPlayerOnAMission();
 };
-- 
cgit v1.2.3