summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 14:20:53 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 14:20:53 +0000
commitdbca3013575b766a681d1cea946e249a386e2144 (patch)
tree243cff9c2afc3469514754b48edce6d91c70d5e8
parent4b8186327de88254d50a59eba0867d9a8590aaf2 (diff)
downloadmana-dbca3013575b766a681d1cea946e249a386e2144.tar.gz
mana-dbca3013575b766a681d1cea946e249a386e2144.tar.bz2
mana-dbca3013575b766a681d1cea946e249a386e2144.tar.xz
mana-dbca3013575b766a681d1cea946e249a386e2144.zip
Reverted wallpaper and added more useful logging to ResourceManager.
-rw-r--r--ChangeLog7
-rw-r--r--data/graphics/images/login_wallpaper.pngbin205907 -> 215527 bytes
-rw-r--r--src/resources/resourcemanager.cpp8
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f1194096..d53c78f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-05 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * data/graphics/images/login_wallpaper.png: Reverted to standard
+ wallpaper.
+ * src/resources/resourcemanager.cpp: More useful logging about
+ resources that are being loaded (including source).
+
2006-11-05 Yohann Ferreira <bertram@cegetel.net>
* src/Makefile.am, src/gui/buy.cpp, src/gui/buy.h, src/gui/shop.h,
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 258bad22..54692dfd 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
Binary files differ
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 1c1eb5db..e729ecfc 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -119,13 +119,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;
}
@@ -262,6 +258,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);