diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-25 19:09:36 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-03-25 19:09:36 +0000 |
commit | c435ea1644f70ca3acaa9f371e6d07952b5f9003 (patch) | |
tree | 867eee76aa9fa1fb74ef165a2694de9ef2db0484 | |
parent | 42f5932053d90dbc49a4401ef259e1f5ef58adbb (diff) | |
download | mana-client-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.gz mana-client-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.bz2 mana-client-c435ea1644f70ca3acaa9f371e6d07952b5f9003.tar.xz mana-client-c435ea1644f70ca3acaa9f371e6d07952b5f9003.zip |
Fix compile issues on Windows.
-rw-r--r-- | src/net/network.cpp | 2 | ||||
-rw-r--r-- | src/resources/image.cpp | 6 | ||||
-rw-r--r-- | src/resources/resourcemanager.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/network.cpp b/src/net/network.cpp index b9d0fc55..44d07e13 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -21,8 +21,8 @@ * $Id$ */ -#include "network.h" #include "../main.h" +#include "network.h" #ifndef WIN32 #include <unistd.h> #include <fcntl.h> 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); |