summaryrefslogtreecommitdiff
path: root/src/resources/mapreader.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-02 11:23:05 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-02 11:23:05 +0000
commitb8dbdb628ba7a07a785e494d0ed76ebfe9e06615 (patch)
tree173d22e656ac771e473cdb7c1d035963d39c27e1 /src/resources/mapreader.cpp
parentb05628214d64e579504c87da72e79c024245a631 (diff)
downloadmana-client-b8dbdb628ba7a07a785e494d0ed76ebfe9e06615.tar.gz
mana-client-b8dbdb628ba7a07a785e494d0ed76ebfe9e06615.tar.bz2
mana-client-b8dbdb628ba7a07a785e494d0ed76ebfe9e06615.tar.xz
mana-client-b8dbdb628ba7a07a785e494d0ed76ebfe9e06615.zip
Made config.xml, tmw.log and chatlog.txt always appear in ~/.tmw on *nix.
Diffstat (limited to 'src/resources/mapreader.cpp')
-rw-r--r--src/resources/mapreader.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 11deacbf..d5d30e79 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -62,7 +62,7 @@ Map *MapReader::readMap(const std::string &filename)
std::fstream fin;
fin.open(name.c_str(), std::ios::in);
if (!fin.is_open()) {
- logger.log("No such file!");
+ logger->log("No such file!");
return NULL;
}
fin.close();
@@ -73,14 +73,14 @@ Map *MapReader::readMap(const std::string &filename)
xmlNodePtr node = xmlDocGetRootElement(doc);
if (!node || !xmlStrEqual(node->name, BAD_CAST "map")) {
- logger.log("Warning: Not a map file (%s)!", filename.c_str());
+ logger->log("Warning: Not a map file (%s)!", filename.c_str());
return NULL;
}
return readMap(node, filename);
xmlFreeDoc(doc);
} else {
- logger.log("Error while parsing map file (%s)!", filename.c_str());
+ logger->log("Error while parsing map file (%s)!", filename.c_str());
}
return NULL;
@@ -115,7 +115,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path)
}
else if (xmlStrEqual(node->name, BAD_CAST "layer"))
{
- logger.log("- Loading layer %d", layerNr);
+ logger->log("- Loading layer %d", layerNr);
readLayer(node, map, layerNr);
layerNr++;
}
@@ -150,7 +150,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
xmlFree(encoding);
if (compression) {
- logger.log("Warning: no layer compression supported!");
+ logger->log("Warning: no layer compression supported!");
xmlFree(compression);
return;
}
@@ -228,7 +228,7 @@ Tileset* MapReader::readTileset(
xmlNodePtr node, const std::string &path, Map *map)
{
if (xmlHasProp(node, BAD_CAST "source")) {
- logger.log("Warning: External tilesets not supported yet.");
+ logger->log("Warning: External tilesets not supported yet.");
return NULL;
}
@@ -259,7 +259,7 @@ Tileset* MapReader::readTileset(
return set;
}
else {
- logger.log("Warning: Failed to load tileset (%s)", source);
+ logger->log("Warning: Failed to load tileset (%s)", source);
}
}