summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-12-21 12:37:17 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-12-21 12:37:17 +0000
commit539af2ea0ce3245c41b4a4be989da35788f7b992 (patch)
treead5ea5e00fa48ecc1e566a4e3d6278ca3a2efe1f
parent85361ea254cc764c31bfcf6b4cc1fb90cda48a85 (diff)
downloadmana-client-539af2ea0ce3245c41b4a4be989da35788f7b992.tar.gz
mana-client-539af2ea0ce3245c41b4a4be989da35788f7b992.tar.bz2
mana-client-539af2ea0ce3245c41b4a4be989da35788f7b992.tar.xz
mana-client-539af2ea0ce3245c41b4a4be989da35788f7b992.zip
Added logging of error on PHYSFS_addToSearchPath.
-rw-r--r--ChangeLog2
-rw-r--r--src/resources/resourcemanager.cpp8
-rw-r--r--src/resources/resourcemanager.h4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bdcbbfab..758e143b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* src/gui/shoplistbox.cpp: Fixed shop list box not to scroll up when
the selection is removed.
+ * src/resources/resourcemanager.h, src/resources/resourcemanager.cpp:
+ Added logging of error on PHYSFS_addToSearchPath.
2007-12-19 Philipp Sehmisch <tmw@crushnet.org>
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 3368d05b..658915d2 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -106,11 +106,15 @@ ResourceManager::setWriteDir(const std::string &path)
return (bool) PHYSFS_setWriteDir(path.c_str());
}
-void
+bool
ResourceManager::addToSearchPath(const std::string &path, bool append)
{
logger->log("Adding to PhysicsFS: %s", path.c_str());
- PHYSFS_addToSearchPath(path.c_str(), append ? 1 : 0);
+ if (!PHYSFS_addToSearchPath(path.c_str(), append ? 1 : 0)) {
+ logger->log("Error: %s", PHYSFS_getLastError());
+ return false;
+ }
+ return true;
}
void
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index c52248b1..1adb8446 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -68,8 +68,10 @@ class ResourceManager
* Adds a directory or archive to the search path. If append is true
* then the directory is added to the end of the search path, otherwise
* it is added at the front.
+ *
+ * @return <code>true</code> on success, <code>false</code> otherwise.
*/
- void
+ bool
addToSearchPath(const std::string &path, bool append);
/**