From 80453d3f4ddc13f8458e14353c318a69cfe10518 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 1 Jan 2020 02:35:54 +0300 Subject: some not fully tested stuff --- src/core/Fire.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/core/Fire.h') 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; -- cgit v1.2.3 From 90233baffe1d394b2c9ab5203c828b2e3bf151e9 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 1 Jan 2020 02:44:13 +0300 Subject: fix merge --- src/core/Fire.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core/Fire.h') diff --git a/src/core/Fire.h b/src/core/Fire.h index cd6de90c..f74ddabe 100644 --- a/src/core/Fire.h +++ b/src/core/Fire.h @@ -42,6 +42,5 @@ public: void RemoveScriptFire(int16); void RemoveAllScriptFires(void); void SetScriptFireAudio(int16, bool); - void ExtinguishPoint(CVector, float); }; extern CFireManager &gFireManager; -- cgit v1.2.3 From 402ecd63052cd3f9c4987d896d6c11e926a6f485 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Wed, 1 Jan 2020 02:55:00 +0300 Subject: fix merge with upstream --- src/core/Fire.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/Fire.h') 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