From 80453d3f4ddc13f8458e14353c318a69cfe10518 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Wed, 1 Jan 2020 02:35:54 +0300
Subject: some not fully tested stuff

---
 src/core/Fire.cpp  | 17 +++++++++++++++--
 src/core/Fire.h    |  9 ++++++++-
 src/core/Stats.cpp | 15 +++++++++++++++
 src/core/Stats.h   | 16 ++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)

(limited to 'src/core')

diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 0317ccbe..274c06a5 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -6,6 +6,13 @@ CFireManager &gFireManager = *(CFireManager*)0x8F31D0;
 
 WRAPPER void CFire::Extinguish(void) { EAXJMP(0x479D40); }
 
+uint32 CFireManager::GetTotalActiveFires() const
+{
+	return m_nTotalFires;
+}
+
+WRAPPER void CFireManager::Update(void) { EAXJMP(0x479310); }
+
 CFire* CFireManager::FindNearestFire(CVector vecPos, float* pDistance)
 {
 	for (int i = 0; i < MAX_FIREMEN_ATTENDING; i++) {
@@ -31,6 +38,12 @@ CFire* CFireManager::FindNearestFire(CVector vecPos, float* pDistance)
 	return nil;
 }
 
-WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); }
-WRAPPER void CFireManager::Update(void) { EAXJMP(0x479310); }
 WRAPPER CFire *CFireManager::FindFurthestFire_NeverMindFireMen(CVector coors, float, float) { EAXJMP(0x479430); }
+WRAPPER void CFireManager::StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32) { EAXJMP(0x479590); }
+WRAPPER void CFireManager::StartFire(CVector, float, uint8) { EAXJMP(0x479500); }
+WRAPPER void CFireManager::ExtinguishPoint(CVector, float) { EAXJMP(0x479DB0); }
+WRAPPER int32 CFireManager::StartScriptFire(const CVector& pos, CEntity* culprit, float, uint8) { EAXJMP(0x479E60); }
+WRAPPER bool CFireManager::IsScriptFireExtinguish(int16) { EAXJMP(0x479FC0); }
+WRAPPER void CFireManager::RemoveScriptFire(int16) { EAXJMP(0x479FE0); }
+WRAPPER void CFireManager::RemoveAllScriptFires(void) { EAXJMP(0x47A000); }
+WRAPPER void CFireManager::SetScriptFireAudio(int16, bool) { EAXJMP(0x47A040); }
diff --git a/src/core/Fire.h b/src/core/Fire.h
index c752b2a6..9d72179e 100644
--- a/src/core/Fire.h
+++ b/src/core/Fire.h
@@ -31,9 +31,16 @@ class CFireManager
 	CFire m_aFires[NUM_FIRES];
 public:
 	void StartFire(CEntity *entityOnFire, CEntity *culprit, float, uint32);
+	void StartFire(CVector, float, uint8);
 	void Update(void);
 	CFire *FindFurthestFire_NeverMindFireMen(CVector coors, float, float);
 	CFire *FindNearestFire(CVector, float*);
-	uint32 GetTotalActiveFires() const { return m_nTotalFires; }
+	uint32 GetTotalActiveFires() const;
+	void ExtinguishPoint(CVector, float);
+	int32 StartScriptFire(const CVector& pos, CEntity* culprit, float, uint8);
+	bool IsScriptFireExtinguish(int16);
+	void RemoveScriptFire(int16);
+	void RemoveAllScriptFires(void);
+	void SetScriptFireAudio(int16, bool);
 };
 extern CFireManager &gFireManager;
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 9641e8f0..5d2401ed 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -12,6 +12,21 @@ int32 *CStats::PedsKilledOfThisType = (int32*)0x880DBC;
 int32 &CStats::TimesDied = *(int32*)0x8E2BDC;
 int32 &CStats::TimesArrested = *(int32*)0x8E2BEC;
 int32 &CStats::KillsSinceLastCheckpoint = *(int32*)0x8F2C8C;
+int32 &CStats::ProgressMade = *(int32*)0x8F6224;
+int32 &CStats::TotalProgressInGame = *(int32*)0x885B2C;
+float &CStats::MaximumJumpDistance = *(float*)0x8F2BDC;
+float &CStats::MaximumJumpHeight = *(float*)0x940564;
+int32 &CStats::MaximumJumpFlips = *(int32*)0x8F2524;
+int32 &CStats::MaximumJumpSpins = *(int32*)0x8F29B0;
+int32 &CStats::BestStuntJump = *(int32*)0x885B50;
+int32 &CStats::NumberOfUniqueJumpsFound = *(int32*)0x885B74;
+int32 &CStats::TotalNumberOfUniqueJumps = *(int32*)0x8E2DC0;
+int32 &CStats::PassengersDroppedOffWithTaxi = *(int32*)0x940724;
+int32 &CStats::MoneyMadeWithTaxi = *(int32*)0x941544;
+int32 &CStats::MissionsGiven = *(int32*)0x9430E8;
+int32 &CStats::MissionsPassed = *(int32*)0x940768;
+char(&CStats::LastMissionPassedName)[8] = *(char(*)[8])*(uintptr*)0x70D828;
+int32 &CStats::TotalLegitimateKills = *(int32*)0x8F6004;
 
 void CStats::AnotherKillFrenzyPassed()
 {
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 7bae8c51..22f0c68a 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -14,8 +14,24 @@ public:
 	static int32 &TimesDied;
 	static int32 &TimesArrested;
 	static int32 &KillsSinceLastCheckpoint;
+	static int32 &ProgressMade;
+	static int32 &TotalProgressInGame;
+	static float &MaximumJumpDistance;
+	static float &MaximumJumpHeight;
+	static int32 &MaximumJumpFlips;
+	static int32 &MaximumJumpSpins;
+	static int32 &BestStuntJump;
+	static int32 &NumberOfUniqueJumpsFound;
+	static int32 &TotalNumberOfUniqueJumps;
+	static int32 &PassengersDroppedOffWithTaxi;
+	static int32 &MoneyMadeWithTaxi;
+	static int32 &MissionsGiven;
+	static int32 &MissionsPassed;
+	static char (&LastMissionPassedName)[8];
+	static int32 &TotalLegitimateKills;
 
 public:
 	static void AnotherKillFrenzyPassed();
 	static void CheckPointReachedUnsuccessfully() { KillsSinceLastCheckpoint = 0; };
+	static void CheckPointReachedSuccessfully() { TotalLegitimateKills += KillsSinceLastCheckpoint; KillsSinceLastCheckpoint = 0; };
 };
\ No newline at end of file
-- 
cgit v1.2.3