diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 02:55:00 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 02:55:00 +0300 |
| commit | 402ecd63052cd3f9c4987d896d6c11e926a6f485 (patch) | |
| tree | c674064864dc2e8095032cdd55943d47dcf891c2 /src/core/Fire.h | |
| parent | fix merge (diff) | |
| download | re3-402ecd63052cd3f9c4987d896d6c11e926a6f485.tar.gz | |
fix merge with upstream
Diffstat (limited to 'src/core/Fire.h')
| -rw-r--r-- | src/core/Fire.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |