fix merge with upstream

2020-01-01 02:55:00 +03:00
parent 90233baffe
commit 402ecd6305
3 changed files with 4 additions and 8 deletions
--- 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);