Logger Implemented. (3/3)

3 files changed, 23 insertions, 20 deletions

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index f976466e..54e0c8b9 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -21,6 +21,7 @@
  *  $Id$
  */
 
+#include "../main.h"
 #include "../graphics.h"
 #include "image.h"
 #include "../log.h"
@@ -51,14 +52,14 @@ Image::~Image()
 
 Image* Image::load(const std::string &filePath, int flags)
 {
-    log("Image::load(%s)", filePath.c_str());
+    logger.log("Image::load(%s)", filePath.c_str());
 
     // Attempt to use SDL_Image to load the file.
     SDL_Surface *tmpImage = IMG_Load(filePath.c_str());
 
     // Check if the file was opened and return the appropriate value.
     if (!tmpImage) {
-        log("Error: Image load failed.");
+        logger.log("Error: Image load failed.");
         return NULL;
     }
 
@@ -77,7 +78,7 @@ Image* Image::load(const std::string &filePath, int flags)
 
     // Check if the file was opened and return the appropriate value.
     if (!image) {
-        log("Error: Image convert failed.");
+        logger.log("Error: Image convert failed.");
         return NULL;
     }
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 7673bf55..38e15945 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -21,6 +21,7 @@
  *  $Id$
  */
 
+#include "../main.h"
 #include "mapreader.h"
 #include "../log.h"
 #include "resourcemanager.h"
@@ -55,25 +56,25 @@ int Tileset::getFirstGid()
 
 Map *MapReader::readMap(const std::string &filename)
 {
-    log("Attempting to parse XML map data");
+    logger.log("Attempting to parse XML map data");
 
     std::string name = std::string("data/") + filename;
     xmlDocPtr doc = xmlParseFile(name.c_str());
 
     if (doc) {
-        log("Looking for root node");
+        logger.log("Looking for root node");
         xmlNodePtr node = xmlDocGetRootElement(doc);
 
         if (!node || !xmlStrEqual(node->name, BAD_CAST "map")) {
-            log("Warning: No map file (%s)!", filename.c_str());
+            logger.log("Warning: No map file (%s)!", filename.c_str());
             return NULL;
         }
         
-        log("Loading map from XML tree");
+        logger.log("Loading map from XML tree");
         return readMap(node, filename);
         xmlFreeDoc(doc);
     } else {
-        log("Error while parsing map file (%s)!", filename.c_str());
+        logger.log("Error while parsing map file (%s)!", filename.c_str());
     }
 
     return NULL;
@@ -108,7 +109,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path)
         }
         else if (xmlStrEqual(node->name, BAD_CAST "layer"))
         {
-            log("- Loading layer %d", layerNr);
+            logger.log("- Loading layer %d", layerNr);
             readLayer(node, map, layerNr);
             layerNr++;
         }
@@ -139,7 +140,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
                 xmlFree(encoding);
 
                 if (compression) {
-                    log("Warning: no layer compression supported!");
+                    logger.log("Warning: no layer compression supported!");
                     xmlFree(compression);
                     return;
                 }
@@ -217,7 +218,7 @@ Tileset* MapReader::readTileset(
         xmlNodePtr node, const std::string &path, Map *map)
 {
     if (xmlHasProp(node, BAD_CAST "source")) {
-        log("Warning: External tilesets not supported yet.");
+        logger.log("Warning: External tilesets not supported yet.");
         return NULL;
     }
 
@@ -246,7 +247,7 @@ Tileset* MapReader::readTileset(
                     return set;
                 }
                 else {
-                    log("Warning: Failed to load tileset (%s)\n", source);
+                    logger.log("Warning: Failed to load tileset (%s)\n", source);
                 }
             }
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index eab6845e..e7b4eef3 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -21,6 +21,7 @@
  *  $Id$
  */
 
+#include "../main.h"
 #include "resourcemanager.h"
 #include "../log.h"
 #include <iostream>
@@ -67,7 +68,7 @@ ResourceManager::~ResourceManager()
     }
     resources.clear();
 
-    log("ResourceManager::~ResourceManager() cleaned up %d references to %d"
+    logger.log("ResourceManager::~ResourceManager() cleaned up %d references to %d"
             " resources", danglingReferences, danglingResources);
 }
 
@@ -96,10 +97,10 @@ Resource* ResourceManager::get(const E_RESOURCE_TYPE &type,
     switch (type)
     {
         case MAP:
-            log("Warning: Map resource not supported.");
+            logger.log("Warning: Map resource not supported.");
             break;
         case MUSIC:
-            log("Warning: Music resource not supported.");
+            logger.log("Warning: Music resource not supported.");
             break;
         case IMAGE:
             // Attempt to create and load our image object.
@@ -126,16 +127,16 @@ Resource* ResourceManager::get(const E_RESOURCE_TYPE &type,
 
             break;
         case SCRIPT:
-            log("Warning: Script resource not supported.");
+            logger.log("Warning: Script resource not supported.");
             break;
         case TILESET:
-            log("Warning: Tileset resource not supported.");
+            logger.log("Warning: Tileset resource not supported.");
             break;
         case SOUND_EFFECT:
-            log("Warning: Sound FX resource not supported.");
+            logger.log("Warning: Sound FX resource not supported.");
             break;
         default: 
-            log("Warning: Unknown resource type");
+            logger.log("Warning: Unknown resource type");
             break;
     }
 
@@ -227,7 +228,7 @@ void ResourceManager::searchAndAddZipFiles()
             std::string filePath = std::string(programPath) +
                 std::string("/") + std::string(direntry->d_name);
 
-            log("Adding to PhysicsFS: %s", filePath.c_str());
+            logger.log("Adding to PhysicsFS: %s", filePath.c_str());
 
             // Add the zip file to our PhysicsFS search path
             PHYSFS_addToSearchPath(filePath.c_str(), 1);