diff options
| author | aap <aap@papnet.eu> | 2021-02-05 10:58:01 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-02-05 10:58:01 +0100 |
| commit | 9125e604b9225a9cb5efd4a615f10b3c73c1d104 (patch) | |
| tree | 9ff7a862750e8c85d5be13464dee64c55c949c4e /src/core | |
| parent | Merge pull request #1018 from erorcun/miami (diff) | |
| download | re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar.gz re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar.bz2 re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar.lz re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar.xz re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.tar.zst re3-9125e604b9225a9cb5efd4a615f10b3c73c1d104.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Game.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index ed9d67f4..43bd3d11 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -381,6 +381,11 @@ bool CGame::Initialise(const char* datFile) CTxdStore::Create(gameTxdSlot); CTxdStore::AddRef(gameTxdSlot); +#ifdef EXTENDED_PIPELINES + // for generic fallback + CustomPipes::SetTxdFindCallback(); +#endif + LoadingScreen("Loading the Game", "Loading particles", nil); int particleTxdSlot = CTxdStore::AddTxdSlot("particle"); CTxdStore::LoadTxd(particleTxdSlot, "MODELS/PARTICLE.TXD"); @@ -440,10 +445,7 @@ bool CGame::Initialise(const char* datFile) CFileLoader::LoadLevel("DATA\\DEFAULT.DAT"); CFileLoader::LoadLevel(datFile); -#ifdef EXTENDED_PIPELINES - // for generic fallback - CustomPipes::SetTxdFindCallback(); -#endif + LoadingScreen("Loading the Game", "Add Particles", nil); CWorld::AddParticles(); CVehicleModelInfo::LoadVehicleColours(); |