summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 15:22:13 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 15:22:13 +0000
commit6374ef220d8f46647190074338f868b5d6bb4a45 (patch)
treea833453c2e712c3e992f71433f6d21c8c379ad15 /src/resources
parentde61b658590630cfc59960c012c8e533b361a8b0 (diff)
downloadmana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.gz
mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.bz2
mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.xz
mana-6374ef220d8f46647190074338f868b5d6bb4a45.zip
Merged 0.0 changes from revision 2800 to 2825 to trunk.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/resourcemanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 23a73497..bb51d023 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -122,13 +122,9 @@ ResourceManager::get(const E_RESOURCE_TYPE &type, const std::string &idPath)
return resIter->second;
}
- logger->log("ResourceManager::get(%s)", idPath.c_str());
-
int fileSize;
void *buffer = loadFile(idPath, fileSize);
-
if (!buffer) {
- logger->log("Warning: resource doesn't exist!");
return NULL;
}
@@ -265,6 +261,10 @@ ResourceManager::loadFile(const std::string &fileName, int &fileSize)
return NULL;
}
+ // Log the real dir of the file
+ logger->log("Loaded %s/%s", PHYSFS_getRealDir(fileName.c_str()),
+ fileName.c_str());
+
// Get the size of the file
fileSize = PHYSFS_fileLength(file);