summaryrefslogtreecommitdiffstats
path: root/src/core/FileLoader.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-21 12:34:29 +0100
committeraap <aap@papnet.eu>2020-12-21 12:34:29 +0100
commitfb97335d9f66d1cce6fba106e7b0f4e9bc7e5662 (patch)
treeecf021ec4959c7c6d0aafdc15220c89b97aa97ac /src/core/FileLoader.cpp
parentmain.cpp mostly checked against ps2 now (diff)
downloadre3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar.gz
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar.bz2
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar.lz
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar.xz
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.tar.zst
re3-fb97335d9f66d1cce6fba106e7b0f4e9bc7e5662.zip
Diffstat (limited to '')
-rw-r--r--src/core/FileLoader.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index d66a1b88..dd313f79 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -98,10 +98,13 @@ CFileLoader::LoadLevel(const char *filename)
}else if(strncmp(line, "IPL", 3) == 0){
if(!objectsLoaded){
LoadingScreenLoadingFile("Collision");
- POP_MEMID();
+ PUSH_MEMID(MEMID_WORLD);
CObjectData::Initialise("DATA\\OBJECT.DAT");
CStreaming::Init();
+ POP_MEMID();
+ PUSH_MEMID(MEMID_COLLISION);
CColStore::LoadAllCollision();
+ POP_MEMID();
for(int i = 0; i < MODELINFOSIZE; i++)
if(CModelInfo::GetModelInfo(i))
CModelInfo::GetModelInfo(i)->ConvertAnimFileIndex();
@@ -110,12 +113,15 @@ CFileLoader::LoadLevel(const char *filename)
PUSH_MEMID(MEMID_WORLD);
LoadingScreenLoadingFile(line + 4);
LoadScene(line + 4);
+ POP_MEMID();
}else if(strncmp(line, "SPLASH", 6) == 0){
#ifndef DISABLE_LOADING_SCREEN
LoadSplash(GetRandomSplashScreen());
#endif
+#ifndef GTA_PS2
}else if(strncmp(line, "CDIMAGE", 7) == 0){
CdStreamAddImage(line + 8);
+#endif
}
}