diff options
| author | aap <aap@papnet.eu> | 2020-05-24 10:44:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 10:44:28 +0200 |
| commit | 34f5e923efe620aa25192ce1fb31695b082ce5b4 (patch) | |
| tree | df812c11da162c563c3484e0dfe1851dd1a61e82 /src/core | |
| parent | Merge branch 'master' into miami (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar.gz re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar.bz2 re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar.lz re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar.xz re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.tar.zst re3-34f5e923efe620aa25192ce1fb31695b082ce5b4.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Game.cpp | 4 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 437bd5ec..02648b27 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -64,6 +64,7 @@ #include "Script.h" #include "Shadows.h" #include "Skidmarks.h" +#include "SetPieces.h" #include "SpecialFX.h" #include "Sprite2d.h" #include "Stats.h" @@ -275,6 +276,7 @@ bool CGame::Initialise(const char* datFile) CCullZones::Init(); COcclusion::Init(); CCollision::Init(); + CSetPieces::Init(); CTheZones::Init(); CUserDisplay::Init(); CMessages::Init(); @@ -529,6 +531,7 @@ void CGame::ShutDownForRestart(void) CRadar::RemoveRadarSections(); FrontEndMenuManager.UnloadTextures(); CParticleObject::RemoveAllParticleObjects(); + CSetPieces::Init(); CPedType::Shutdown(); CSpecialFX::Shutdown(); TidyUpMemory(true, false); @@ -622,6 +625,7 @@ void CGame::Process(void) CAntennas::Update(); CGlass::Update(); CSceneEdit::Update(); + CSetPieces::Update(); CEventList::Update(); CParticle::Update(); gFireManager.Update(); diff --git a/src/core/config.h b/src/core/config.h index 294dafbc..ea31a3c8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -135,6 +135,8 @@ enum Config { NUM_CRANES = 8, NUM_EXPLOSIONS = 48, + + NUM_SETPIECES = 96 }; // We'll use this once we're ready to become independent of the game |