From daed13485ef47d9c8992e53e1a976fba237fca50 Mon Sep 17 00:00:00 2001
From: Fire-Head <Fire-Head@users.noreply.github.com>
Date: Wed, 15 Apr 2020 08:03:53 +0300
Subject: CWeapon done, ps2 cheats fix

---
 src/core/General.h | 5 +++++
 src/core/Pad.cpp   | 2 ++
 src/core/World.cpp | 1 +
 src/core/World.h   | 2 ++
 src/core/main.cpp  | 3 ++-
 5 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/General.h b/src/core/General.h
index f32846eb..77828854 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -90,6 +90,11 @@ public:
 				return -Atan2(x / y, 1.0f);
 		}
 	}
+	
+	static float GetAngleBetweenPoints(float x1, float y1, float x2, float y2)
+	{
+		return RADTODEG(GetRadianAngleBetweenPoints(x1, y1, x2, y2));
+	}
 
 	// should return direction in 0-8 range. fits perfectly to peds' path directions.
 	static int GetNodeHeadingFromVector(float x, float y)
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 6efbeb8e..9d00cef7 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -642,6 +642,8 @@ void CPad::AddToCheatString(char c)
 {
 	for ( int32 i = ARRAY_SIZE(CheatString) - 2; i >= 0; i-- )
 		CheatString[i + 1] = CheatString[i];
+	
+	CheatString[0] = c;
 
 #define _CHEATCMP(str)  strncmp(str, CheatString, sizeof(str)-1)
 	// "4414LDRULDRU"	-	R2 R2 L1 R2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
diff --git a/src/core/World.cpp b/src/core/World.cpp
index d64569b3..b4ae9346 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -58,6 +58,7 @@ WRAPPER void CWorld::ClearPedsFromArea(float, float, float, float, float, float)
 WRAPPER void CWorld::CallOffChaseForArea(float, float, float, float) { EAXJMP(0x4B5530); }
 WRAPPER void CWorld::TriggerExplosion(const CVector& a1, float a2, float a3, CEntity *a4, bool a5) { EAXJMP(0x4B1140); }
 WRAPPER void CWorld::SetPedsOnFire(float, float, float, float, CEntity*) { EAXJMP(0x4B3D30); }
+WRAPPER void CWorld::UseDetonator(CEntity *) { EAXJMP(0x4B4650); }
 
 void
 CWorld::Initialise()
diff --git a/src/core/World.h b/src/core/World.h
index 07e7889f..0ee3fdda 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -142,6 +142,8 @@ public:
 	static void RemoveStaticObjects();
 	static void Process();
 	static void TriggerExplosion(const CVector &, float, float, CEntity*, bool);
+	
+	static void UseDetonator(CEntity *);
 };
 
 extern CColPoint *gaTempSphereColPoints;
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 93e4c71c..02f7d523 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1557,8 +1557,9 @@ void SystemInit()
 	//
 #endif
 	
-	
+#ifdef GTA_PS2_STUFF
 	CPad::Initialise();
+#endif
 	CPad::GetPad(0)->Mode = 0;
 	
 	CGame::frenchGame = false;
-- 
cgit v1.2.3