summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-09 12:30:13 +0200
committerGitHub <noreply@github.com>2020-04-09 12:30:13 +0200
commita6d449a2f4fc9cddb6f7ad8b736ba3e98395af73 (patch)
tree969b0346b149d804fc27c2457fe45e91f39d8018 /src/core
parentMerge pull request #389 from Nick007J/master (diff)
parentFinished CExplosion (diff)
downloadre3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar.gz
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar.bz2
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar.lz
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar.xz
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.tar.zst
re3-a6d449a2f4fc9cddb6f7ad8b736ba3e98395af73.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/World.cpp2
-rw-r--r--src/core/World.h2
-rw-r--r--src/core/config.h4
3 files changed, 7 insertions, 1 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 4a0230ce..d64569b3 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -56,6 +56,8 @@ WRAPPER void CWorld::FindMissionEntitiesIntersectingCube(const CVector&, const C
WRAPPER void CWorld::ClearCarsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B50E0); }
WRAPPER void CWorld::ClearPedsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B52B0); }
WRAPPER void CWorld::CallOffChaseForArea(float, float, float, float) { EAXJMP(0x4B5530); }
+WRAPPER void CWorld::TriggerExplosion(const CVector& a1, float a2, float a3, CEntity *a4, bool a5) { EAXJMP(0x4B1140); }
+WRAPPER void CWorld::SetPedsOnFire(float, float, float, float, CEntity*) { EAXJMP(0x4B3D30); }
void
CWorld::Initialise()
diff --git a/src/core/World.h b/src/core/World.h
index c4103eb2..07e7889f 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -132,6 +132,7 @@ public:
static void SetAllCarsCanBeDamaged(bool);
static void ExtinguishAllCarFiresInArea(CVector, float);
static void SetCarsOnFire(float, float, float, float, CEntity*);
+ static void SetPedsOnFire(float, float, float, float, CEntity*);
static void Initialise();
static void AddParticles();
@@ -140,6 +141,7 @@ public:
static void RepositionCertainDynamicObjects();
static void RemoveStaticObjects();
static void Process();
+ static void TriggerExplosion(const CVector &, float, float, CEntity*, bool);
};
extern CColPoint *gaTempSphereColPoints;
diff --git a/src/core/config.h b/src/core/config.h
index f7ddbe0b..198ee946 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -126,7 +126,9 @@ enum Config {
NUM_GARAGE_STORED_CARS = 6,
- NUM_CRANES = 8
+ NUM_CRANES = 8,
+
+ NUM_EXPLOSIONS = 48,
};
// We'll use this once we're ready to become independent of the game