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 | |
| parent | 90233baffe1d394b2c9ab5203c828b2e3bf151e9 (diff) | |
fix merge with upstream
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Fire.cpp | 4 | ||||
| -rw-r--r-- | src/core/Fire.h | 2 |
2 files changed, 1 insertions, 5 deletions
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); |