Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
src: more SetDir() calls
  • Loading branch information
Tatsh committed Feb 14, 2021
1 parent a3b609f commit 2830d990c61470071d7dbd65842b156988c6c8c4
@@ -763,6 +763,7 @@ CAnimManager::LoadAnimFiles(void)
{ {
int i, j; int i, j;


CFileMgr::SetDir("");
LoadAnimFile("ANIM\\PED.IFP"); LoadAnimFile("ANIM\\PED.IFP");


// Create all assoc groups // Create all assoc groups
@@ -155,6 +155,7 @@ CCutsceneMgr::Initialise(void)
ms_cutsceneProcessing = false; ms_cutsceneProcessing = false;
ms_useLodMultiplier = false; ms_useLodMultiplier = false;


CFileMgr::SetDir("");
ms_pCutsceneDir = new CDirectory(CUTSCENEDIRSIZE); ms_pCutsceneDir = new CDirectory(CUTSCENEDIRSIZE);
ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR"); ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");
} }
@@ -179,12 +180,14 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
CTimer::Stop(); CTimer::Stop();


ms_pCutsceneDir->numEntries = 0; ms_pCutsceneDir->numEntries = 0;
CFileMgr::SetDir("");
ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR"); ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");


CStreaming::RemoveUnusedModelsInLoadedList(); CStreaming::RemoveUnusedModelsInLoadedList();
CGame::DrasticTidyUpMemory(true); CGame::DrasticTidyUpMemory(true);


strcpy(ms_cutsceneName, szCutsceneName); strcpy(ms_cutsceneName, szCutsceneName);
CFileMgr::SetDir("");
file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb"); file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb");


// Load animations // Load animations
@@ -117,6 +117,7 @@ CAnimViewer::Initialise(void) {
CDraw::SetFOV(120.0f); CDraw::SetFOV(120.0f);
CDraw::ms_fLODDistance = 500.0f; CDraw::ms_fLODDistance = 500.0f;


CFileMgr::SetDir("");
int fd = CFileMgr::OpenFile("DATA\\SPECIAL.TXT", "r"); int fd = CFileMgr::OpenFile("DATA\\SPECIAL.TXT", "r");
char animGroup[32], modelName[32]; char animGroup[32], modelName[32];
if (fd) { if (fd) {
@@ -210,6 +210,7 @@ CFileLoader::LoadCollisionFile(const char *filename)
PUSH_MEMID(MEMID_COLLISION); PUSH_MEMID(MEMID_COLLISION);


debug("Loading collision file %s\n", filename); debug("Loading collision file %s\n", filename);
CFileMgr::SetDir("");
fd = CFileMgr::OpenFile(filename, "rb"); fd = CFileMgr::OpenFile(filename, "rb");


while(CFileMgr::Read(fd, (char*)&header, sizeof(header))){ while(CFileMgr::Read(fd, (char*)&header, sizeof(header))){
@@ -987,6 +988,7 @@ CFileLoader::LoadObjectTypes(const char *filename)
mlo = 0; mlo = 0;
debug("Loading object types from %s...\n", filename); debug("Loading object types from %s...\n", filename);


CFileMgr::SetDir("");
fd = CFileMgr::OpenFile(filename, "rb"); fd = CFileMgr::OpenFile(filename, "rb");
for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
if(*line == '\0' || *line == '#') if(*line == '\0' || *line == '#')
@@ -1493,6 +1495,7 @@ CFileLoader::LoadScene(const char *filename)
pathIndex = -1; pathIndex = -1;
debug("Creating objects from %s...\n", filename); debug("Creating objects from %s...\n", filename);


CFileMgr::SetDir("");
fd = CFileMgr::OpenFile(filename, "rb"); fd = CFileMgr::OpenFile(filename, "rb");
for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
if(*line == '\0' || *line == '#') if(*line == '\0' || *line == '#')
@@ -1656,6 +1659,7 @@ CFileLoader::LoadMapZones(const char *filename)
section = NONE; section = NONE;
debug("Creating zones from %s...\n", filename); debug("Creating zones from %s...\n", filename);


CFileMgr::SetDir("");
fd = CFileMgr::OpenFile(filename, "rb"); fd = CFileMgr::OpenFile(filename, "rb");
for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){ for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
if(*line == '\0' || *line == '#') if(*line == '\0' || *line == '#')
@@ -1699,6 +1703,7 @@ CFileLoader::ReloadPaths(const char *filename)
char pathTypeStr[20]; char pathTypeStr[20];
debug("Reloading paths from %s...\n", filename); debug("Reloading paths from %s...\n", filename);


CFileMgr::SetDir("");
int fd = CFileMgr::OpenFile(filename, "r"); int fd = CFileMgr::OpenFile(filename, "r");
for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) { for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
if (*line == '\0' || *line == '#') if (*line == '\0' || *line == '#')
@@ -1772,6 +1772,7 @@ void
InitialiseGame(void) InitialiseGame(void)
{ {
LoadingScreen(nil, nil, "loadsc0"); LoadingScreen(nil, nil, "loadsc0");
CFileMgr::SetDir("");
CGame::Initialise("DATA\\GTA3.DAT"); CGame::Initialise("DATA\\GTA3.DAT");
} }


@@ -61,7 +61,7 @@ CWaterLevel::Initialise(Const char *pWaterDat)


#ifdef MASTER #ifdef MASTER
int32 hFile = -1; int32 hFile = -1;

CFileMgr::SetDir("");
do do
{ {
hFile = CFileMgr::OpenFile("DATA\\waterpro.dat", "rb"); hFile = CFileMgr::OpenFile("DATA\\waterpro.dat", "rb");
@@ -243,6 +243,7 @@ ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8)
cap16 = UINT32_MAX; cap16 = UINT32_MAX;
cap8 = UINT32_MAX; cap8 = UINT32_MAX;


CFileMgr::SetDir("");
int32 file = CFileMgr::OpenFile("DATA\\CAPS.DAT", "rb"); int32 file = CFileMgr::OpenFile("DATA\\CAPS.DAT", "rb");
if (file != 0) { if (file != 0) {
CFileMgr::Read(file, (char*)&cap32, 4); CFileMgr::Read(file, (char*)&cap32, 4);
@@ -378,6 +378,7 @@ GenericLoad()
bool bool
ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size) ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size)
{ {
CFileMgr::SetDir("");
file = CFileMgr::OpenFile(LoadFileName, "rb"); file = CFileMgr::OpenFile(LoadFileName, "rb");
if (file == 0) { if (file == 0) {
PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN;
@@ -493,6 +494,7 @@ CheckDataNotCorrupt(int32 slot, char *name)
eLevelName level = LEVEL_GENERIC; eLevelName level = LEVEL_GENERIC;
CheckSum = 0; CheckSum = 0;
uint32 bytes_processed = 0; uint32 bytes_processed = 0;
CFileMgr::SetDir("");
sprintf(filename, "%s%i%s", DefaultPCSaveFileName, slot + 1, ".b"); sprintf(filename, "%s%i%s", DefaultPCSaveFileName, slot + 1, ".b");
int file = CFileMgr::OpenFile(filename, "rb"); int file = CFileMgr::OpenFile(filename, "rb");
if (file == 0) if (file == 0)
@@ -546,6 +548,7 @@ RestoreForStartLoad()
{ {
uint8 buf[999]; uint8 buf[999];


CFileMgr::SetDir("");
int file = CFileMgr::OpenFile(LoadFileName, "rb"); int file = CFileMgr::OpenFile(LoadFileName, "rb");
if (file == 0) { if (file == 0) {
PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN;
@@ -40,6 +40,7 @@ C_PcSave::SaveSlot(int32 slot)
MakeValidSaveName(slot); MakeValidSaveName(slot);
PcSaveHelper.nErrorCode = SAVESTATUS_SUCCESSFUL; PcSaveHelper.nErrorCode = SAVESTATUS_SUCCESSFUL;
_psGetUserFilesFolder(); _psGetUserFilesFolder();
CFileMgr::SetDir("");
int file = CFileMgr::OpenFile(ValidSaveName, "wb"); int file = CFileMgr::OpenFile(ValidSaveName, "wb");
if (file != 0) { if (file != 0) {
#ifdef MISSION_REPLAY #ifdef MISSION_REPLAY
@@ -93,6 +94,7 @@ C_PcSave::PopulateSlotInfo()
SlotFileName[i][0] = '\0'; SlotFileName[i][0] = '\0';
SlotSaveDate[i][0] = '\0'; SlotSaveDate[i][0] = '\0';
} }
CFileMgr::SetDir("");
for (int i = 0; i < SLOT_COUNT; i++) { for (int i = 0; i < SLOT_COUNT; i++) {
#ifdef FIX_BUGS #ifdef FIX_BUGS
char savename[MAX_PATH]; char savename[MAX_PATH];

0 comments on commit 2830d99

Please sign in to comment.