diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-10-12 10:13:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 10:13:46 +0200 |
| commit | 9e0b23f06517e6ead7ae63dcf899e58387474cb3 (patch) | |
| tree | e77c7603491b84f7ecc9411f412343484c873036 /src/core/Fire.h | |
| parent | Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad (diff) | |
| parent | Hud, Fire, OnscreenBlaBla (diff) | |
| download | re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.gz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.bz2 re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.lz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.xz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.zst re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.zip | |
Diffstat (limited to 'src/core/Fire.h')
| -rw-r--r-- | src/core/Fire.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/Fire.h b/src/core/Fire.h index 85e53f61..8126f830 100644 --- a/src/core/Fire.h +++ b/src/core/Fire.h @@ -14,10 +14,10 @@ public: CEntity *m_pSource; uint32 m_nExtinguishTime; uint32 m_nStartTime; - int32 field_20; uint32 m_nNextTimeToAddFlames; - uint32 m_nFiremenPuttingOut; float m_fStrength; + float m_fWaterExtinguishCountdown; + bool m_bExtinguishedWithWater; CFire(); ~CFire(); @@ -34,15 +34,17 @@ class CFireManager public: uint32 m_nTotalFires; CFire m_aFires[NUM_FIRES]; - void StartFire(CVector pos, float size, bool propagation); - CFire *StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, bool propagation); + + void StartFire(CVector pos, float size, uint8 propagation); + CFire *StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, uint8 propagation); void Update(void); CFire *FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange); CFire *FindNearestFire(CVector vecPos, float *pDistance); CFire *GetNextFreeFire(void); uint32 GetTotalActiveFires() const; void ExtinguishPoint(CVector point, float range); - int32 StartScriptFire(const CVector &pos, CEntity *target, float strength, bool propagation); + bool ExtinguishPointWithWater(CVector point, float range); + int32 StartScriptFire(const CVector &pos, CEntity *target, float strength, uint8 propagation); bool IsScriptFireExtinguish(int16 index); void RemoveAllScriptFires(void); void RemoveScriptFire(int16 index); |