summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 19:09:36 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 19:09:36 +0000
commitc435ea1644f70ca3acaa9f371e6d07952b5f9003 (patch)
tree867eee76aa9fa1fb74ef165a2694de9ef2db0484 /src/resources
parent42f5932053d90dbc49a4401ef259e1f5ef58adbb (diff)
downloadMana-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.gz
Mana-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.bz2
Mana-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.xz
Mana-c435ea1644f70ca3acaa9f371e6d07952b5f9003.zip
Fix compile issues on Windows.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.cpp6
-rw-r--r--src/resources/resourcemanager.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 54e0c8b9..a8af4e13 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -103,7 +103,7 @@ Image* Image::load(const std::string &filePath, int flags)
rmask, gmask, bmask, amask);
if (formatImage == NULL) {
- log("Error", "Image load failed: not enough memory");
+ logger.log("Error", "Image load failed: not enough memory");
}
SDL_Surface *image = SDL_ConvertSurface(
@@ -151,7 +151,7 @@ Image* Image::load(const std::string &filePath, int flags)
GLuint texture;
glGenTextures(1, &texture);
- log("Binding texture %d (%dx%d)", texture, realWidth, realHeight);
+ logger.log("Binding texture %d (%dx%d)", texture, realWidth, realHeight);
glBindTexture(GL_TEXTURE_2D, texture);
glTexImage2D(
GL_TEXTURE_2D, 0, 4,
@@ -191,7 +191,7 @@ Image* Image::load(const std::string &filePath, int flags)
errmsg = "GL_OUT_OF_MEMORY";
break;
}
- log("Error: Image GL import failed: %s", errmsg.c_str());
+ logger.log("Error: Image GL import failed: %s", errmsg.c_str());
return NULL;
}
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index e7b4eef3..3733f128 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -195,7 +195,7 @@ void ResourceManager::searchAndAddZipFiles()
std::string filePath = std::string("data/") +
std::string(findFileInfo.name);
- log("Adding to PhysicsFS: %s", findFileInfo.name);
+ logger.log("Adding to PhysicsFS: %s", findFileInfo.name);
// Add the zip file to our PhysicsFS search path
PHYSFS_addToSearchPath(filePath.c_str(), 1);