immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error logging in CResourceManager for further debugging #414

master
krzys-h 2015-03-19 19:55:22 +01:00
parent f43acaa943
commit a60a4590b2
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/resources/resourcemanager.cpp
View File

@ -40,8 +40,10 @@ CResourceManager::CResourceManager(const char *argv0)
{ {
if (!PHYSFS_init(argv0)) if (!PHYSFS_init(argv0))
{ {
CLogger::GetInstancePointer()->Error("Error while initializing physfs\n"); CLogger::GetInstancePointer()->Error("Error while initializing physfs: %s\n", PHYSFS_getLastError());
assert(false);
} }
PHYSFS_permitSymbolicLinks(1);
} }
@ -51,7 +53,7 @@ CResourceManager::~CResourceManager()
{ {
if (!PHYSFS_deinit()) if (!PHYSFS_deinit())
{ {
CLogger::GetInstancePointer()->Error("Error while deinitializing physfs\n"); CLogger::GetInstancePointer()->Error("Error while deinitializing physfs: %s\n", PHYSFS_getLastError());
} }
} }
} }
@ -64,43 +66,37 @@ std::string CResourceManager::CleanPath(const std::string& path)
bool CResourceManager::AddLocation(const std::string &location, bool prepend) bool CResourceManager::AddLocation(const std::string &location, bool prepend)
{ {
if (PHYSFS_isInit()) if (!PHYSFS_mount(location.c_str(), nullptr, prepend ? 0 : 1))
{ {
if (!PHYSFS_mount(location.c_str(), nullptr, prepend ? 0 : 1)) CLogger::GetInstancePointer()->Error("Error while mounting \"%s\": %s\n", location.c_str(), PHYSFS_getLastError());
{ return false;
CLogger::GetInstancePointer()->Error("Error while mounting \"%s\"\n", location.c_str());
}
} }
return false; return true;
} }
bool CResourceManager::RemoveLocation(const std::string &location) bool CResourceManager::RemoveLocation(const std::string &location)
{ {
if (PHYSFS_isInit()) if (!PHYSFS_removeFromSearchPath(location.c_str()))
{ {
if (!PHYSFS_removeFromSearchPath(location.c_str())) CLogger::GetInstancePointer()->Error("Error while unmounting \"%s\": %s\n", location.c_str(), PHYSFS_getLastError());
{ return false;
CLogger::GetInstancePointer()->Error("Error while unmounting \"%s\"\n", location.c_str());
}
} }
return false; return true;
} }
bool CResourceManager::SetSaveLocation(const std::string &location) bool CResourceManager::SetSaveLocation(const std::string &location)
{ {
if (PHYSFS_isInit()) if (!PHYSFS_setWriteDir(location.c_str()))
{ {
if (!PHYSFS_setWriteDir(location.c_str())) CLogger::GetInstancePointer()->Error("Error while setting save location to \"%s\": %s\n", location.c_str(), PHYSFS_getLastError());
{ return false;
CLogger::GetInstancePointer()->Error("Error while setting save location to \"%s\"\n", location.c_str());
}
} }
return false; return true;
} }
std::string CResourceManager::GetSaveLocation() std::string CResourceManager::GetSaveLocation()
@ -127,7 +123,6 @@ SDL_RWops* CResourceManager::GetSDLFileHandler(const std::string &filename)
return nullptr; return nullptr;
} }
PHYSFS_permitSymbolicLinks(1);
PHYSFS_File *file = PHYSFS_openRead(CleanPath(filename).c_str()); PHYSFS_File *file = PHYSFS_openRead(CleanPath(filename).c_str());
if (!file) if (!file)
{ {