summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorblingu <36486731+blingu@users.noreply.github.com>2020-03-25 21:01:10 +0100
committerGitHub <noreply@github.com>2020-03-25 21:01:10 +0100
commit834f4f6d4c423683bf78e388418a260094c7bf21 (patch)
treee5a122aa7786ada6ca5bad06362400297756f20a /src
parentUpdate Fire.cpp (diff)
downloadre3-834f4f6d4c423683bf78e388418a260094c7bf21.tar
re3-834f4f6d4c423683bf78e388418a260094c7bf21.tar.gz
re3-834f4f6d4c423683bf78e388418a260094c7bf21.tar.bz2
re3-834f4f6d4c423683bf78e388418a260094c7bf21.tar.lz
re3-834f4f6d4c423683bf78e388418a260094c7bf21.tar.xz
re3-834f4f6d4c423683bf78e388418a260094c7bf21.tar.zst
re3-834f4f6d4c423683bf78e388418a260094c7bf21.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Fire.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Fire.h b/src/core/Fire.h
index 89ab9a9f..aa65fb8f 100644
--- a/src/core/Fire.h
+++ b/src/core/Fire.h
@@ -14,7 +14,7 @@ public:
CEntity *m_pSource;
uint32 m_nExtinguishTime;
uint32 m_nStartTime;
- int32 field_20;
+ int field_20;
uint32 field_24;
uint32 m_nFiremenPuttingOut;
float m_fStrength;
@@ -35,12 +35,12 @@ public:
uint32 m_nTotalFires;
CFire m_aFires[NUM_FIRES];
void StartFire(CVector pos, float size, bool propagation);
- void StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, bool propagation);
+ CFire *StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, bool propagation);
void Update(void);
CFire *FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange);
CFire *FindNearestFire(CVector vecPos, float *pDistance);
CFire *GetNextFreeFire(void);
- uint32 GetTotalActiveFires(void) const;
+ uint32 GetTotalActiveFires() const;
void ExtinguishPoint(CVector point, float range);
int32 StartScriptFire(const CVector &pos, CEntity *target, float strength, bool propagation);
bool IsScriptFireExtinguish(int16 index);