From 402ecd63052cd3f9c4987d896d6c11e926a6f485 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Wed, 1 Jan 2020 02:55:00 +0300
Subject: fix merge with upstream

---
 src/control/Script.cpp | 6 +++---
 src/core/Fire.cpp      | 4 ----
 src/core/Fire.h        | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index c08eefe2..2e47b288 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -5294,10 +5294,10 @@ int8 CRunningScript::ProcessCommandsFrom600To699(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		if (ScriptParams[0] != 0){
-			CWorld::Players[CWorld::PlayerInFocus].m_nSwitchTaxiTime = CTimer::GetTimeInMilliseconds();
-			CWorld::Players[CWorld::PlayerInFocus].m_bSwitchTaxi = true;
+			CWorld::Players[CWorld::PlayerInFocus].m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds();
+			CWorld::Players[CWorld::PlayerInFocus].m_bUnusedTaxiThing = true;
 		}else{
-			CWorld::Players[CWorld::PlayerInFocus].m_bSwitchTaxi = false;
+			CWorld::Players[CWorld::PlayerInFocus].m_bUnusedTaxiThing = false;
 		}
 		return 0;
 	}
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 5c777eab..f83ad2c8 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -5,7 +5,6 @@
 CFireManager &gFireManager = *(CFireManager*)0x8F31D0;
 
 WRAPPER void CFire::Extinguish(void) { EAXJMP(0x479D40); }
-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); }
 
@@ -14,8 +13,6 @@ 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++) {
@@ -52,7 +49,6 @@ CFireManager::ExtinguishPoint(CVector point, float range)
 	}
 }
 
-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 int32 CFireManager::StartScriptFire(const CVector& pos, CEntity* culprit, float, uint8) { EAXJMP(0x479E60); }
diff --git a/src/core/Fire.h b/src/core/Fire.h
index f74ddabe..9d72179e 100644
--- a/src/core/Fire.h
+++ b/src/core/Fire.h
@@ -35,7 +35,7 @@ public:
 	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);
-- 
cgit v1.2.3