summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-16 21:54:38 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-16 21:54:38 +0000
commit9ee453c73292d460eda49129beddf00d21ea81c7 (patch)
treeca5a08a28f6fcceb90e3d17a50f67e107704df06
parentf80bf2dfb4de682a56abe79b7b0e5e0459804b30 (diff)
downloadmana-client-9ee453c73292d460eda49129beddf00d21ea81c7.tar.gz
mana-client-9ee453c73292d460eda49129beddf00d21ea81c7.tar.bz2
mana-client-9ee453c73292d460eda49129beddf00d21ea81c7.tar.xz
mana-client-9ee453c73292d460eda49129beddf00d21ea81c7.zip
This little workaround necessary to prevent crashes for now.
-rw-r--r--src/resources/resource.cpp4
-rw-r--r--src/resources/resourcemanager.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 6b4a554f..a1e5c1dc 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -25,7 +25,7 @@
Resource::Resource():
referenceCount(0)
-{
+{
}
bool Resource::isLoaded() const
@@ -49,7 +49,7 @@ bool Resource::decRef()
--referenceCount;
if (!referenceCount) {
- delete this;
+ //delete this;
return true;
}
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 051f047c..0abc10eb 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -210,8 +210,8 @@ void ResourceManager::deleteInstance()
void ResourceManager::searchAndAddZipFiles()
{
// Add the main data directory to our PhysicsFS search path
- PHYSFS_addToSearchPath(TMW_DATADIR "data", 1);
PHYSFS_addToSearchPath("data", 1);
+ PHYSFS_addToSearchPath(TMW_DATADIR "data", 1);
#ifdef _WIN32
// Define the path in which to search