From cb0c9a75d77b1a4a1b4c6e6ced87c5f1698e163f Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Wed, 28 Oct 2020 02:41:41 -0400 Subject: [PATCH] src: more SetDir() calls --- src/animation/AnimManager.cpp | 1 + src/animation/CutsceneMgr.cpp | 3 +++ src/core/AnimViewer.cpp | 1 + src/core/FileLoader.cpp | 5 +++++ src/core/main.cpp | 1 + src/render/WaterLevel.cpp | 2 +- src/rw/TexRead.cpp | 1 + src/save/GenericGameStorage.cpp | 3 +++ src/save/PCSave.cpp | 2 ++ 9 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index 557bd842c..ac577cd86 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -763,6 +763,7 @@ CAnimManager::LoadAnimFiles(void) { int i, j; + CFileMgr::SetDir(""); LoadAnimFile("ANIM\\PED.IFP"); // Create all assoc groups diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp index 83c4dbcbc..1c710d2fe 100644 --- a/src/animation/CutsceneMgr.cpp +++ b/src/animation/CutsceneMgr.cpp @@ -155,6 +155,7 @@ CCutsceneMgr::Initialise(void) ms_cutsceneProcessing = false; ms_useLodMultiplier = false; + CFileMgr::SetDir(""); ms_pCutsceneDir = new CDirectory(CUTSCENEDIRSIZE); ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR"); } @@ -179,12 +180,14 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName) CTimer::Stop(); ms_pCutsceneDir->numEntries = 0; + CFileMgr::SetDir(""); ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR"); CStreaming::RemoveUnusedModelsInLoadedList(); CGame::DrasticTidyUpMemory(true); strcpy(ms_cutsceneName, szCutsceneName); + CFileMgr::SetDir(""); file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb"); // Load animations diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index a888d5280..e2f71fd62 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -117,6 +117,7 @@ CAnimViewer::Initialise(void) { CDraw::SetFOV(120.0f); CDraw::ms_fLODDistance = 500.0f; + CFileMgr::SetDir(""); int fd = CFileMgr::OpenFile("DATA\\SPECIAL.TXT", "r"); char animGroup[32], modelName[32]; if (fd) { diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 22e0159c7..dfae3bb1a 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -210,6 +210,7 @@ CFileLoader::LoadCollisionFile(const char *filename) PUSH_MEMID(MEMID_COLLISION); debug("Loading collision file %s\n", filename); + CFileMgr::SetDir(""); fd = CFileMgr::OpenFile(filename, "rb"); while(CFileMgr::Read(fd, (char*)&header, sizeof(header))){ @@ -987,6 +988,7 @@ CFileLoader::LoadObjectTypes(const char *filename) mlo = 0; debug("Loading object types from %s...\n", filename); + CFileMgr::SetDir(""); fd = CFileMgr::OpenFile(filename, "rb"); for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ if(*line == '\0' || *line == '#') @@ -1493,6 +1495,7 @@ CFileLoader::LoadScene(const char *filename) pathIndex = -1; debug("Creating objects from %s...\n", filename); + CFileMgr::SetDir(""); fd = CFileMgr::OpenFile(filename, "rb"); for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ if(*line == '\0' || *line == '#') @@ -1656,6 +1659,7 @@ CFileLoader::LoadMapZones(const char *filename) section = NONE; debug("Creating zones from %s...\n", filename); + CFileMgr::SetDir(""); fd = CFileMgr::OpenFile(filename, "rb"); for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ if(*line == '\0' || *line == '#') @@ -1699,6 +1703,7 @@ CFileLoader::ReloadPaths(const char *filename) char pathTypeStr[20]; debug("Reloading paths from %s...\n", filename); + CFileMgr::SetDir(""); int fd = CFileMgr::OpenFile(filename, "r"); for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) { if (*line == '\0' || *line == '#') diff --git a/src/core/main.cpp b/src/core/main.cpp index eea07dc01..f3eb708f7 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1678,6 +1678,7 @@ void InitialiseGame(void) { LoadingScreen(nil, nil, "loadsc0"); + CFileMgr::SetDir(""); CGame::Initialise("DATA\\GTA3.DAT"); } diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index 7aa01f5ab..23dda7e21 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -61,7 +61,7 @@ CWaterLevel::Initialise(Const char *pWaterDat) #ifdef MASTER int32 hFile = -1; - + CFileMgr::SetDir(""); do { hFile = CFileMgr::OpenFile("DATA\\waterpro.dat", "rb"); diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp index d0addcca3..a184e32ff 100644 --- a/src/rw/TexRead.cpp +++ b/src/rw/TexRead.cpp @@ -233,6 +233,7 @@ ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8) cap16 = UINT32_MAX; cap8 = UINT32_MAX; + CFileMgr::SetDir(""); int32 file = CFileMgr::OpenFile("DATA\\CAPS.DAT", "rb"); if (file != 0) { CFileMgr::Read(file, (char*)&cap32, 4); diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index a7cafec85..332364471 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -378,6 +378,7 @@ GenericLoad() bool ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size) { + CFileMgr::SetDir(""); file = CFileMgr::OpenFile(LoadFileName, "rb"); if (file == 0) { PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; @@ -493,6 +494,7 @@ CheckDataNotCorrupt(int32 slot, char *name) eLevelName level = LEVEL_GENERIC; CheckSum = 0; uint32 bytes_processed = 0; + CFileMgr::SetDir(""); sprintf(filename, "%s%i%s", DefaultPCSaveFileName, slot + 1, ".b"); int file = CFileMgr::OpenFile(filename, "rb"); if (file == 0) @@ -546,6 +548,7 @@ RestoreForStartLoad() { uint8 buf[999]; + CFileMgr::SetDir(""); int file = CFileMgr::OpenFile(LoadFileName, "rb"); if (file == 0) { PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; diff --git a/src/save/PCSave.cpp b/src/save/PCSave.cpp index d8ede0d3a..597058df7 100644 --- a/src/save/PCSave.cpp +++ b/src/save/PCSave.cpp @@ -40,6 +40,7 @@ C_PcSave::SaveSlot(int32 slot) MakeValidSaveName(slot); PcSaveHelper.nErrorCode = SAVESTATUS_SUCCESSFUL; _psGetUserFilesFolder(); + CFileMgr::SetDir(""); int file = CFileMgr::OpenFile(ValidSaveName, "wb"); if (file != 0) { #ifdef MISSION_REPLAY @@ -93,6 +94,7 @@ C_PcSave::PopulateSlotInfo() SlotFileName[i][0] = '\0'; SlotSaveDate[i][0] = '\0'; } + CFileMgr::SetDir(""); for (int i = 0; i < SLOT_COUNT; i++) { #ifdef FIX_BUGS char savename[MAX_PATH];