summaryrefslogtreecommitdiff
path: root/src/mapreader.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2005-12-20 21:08:00 +0000
committerYohann Ferreira <bertram@cegetel.net>2005-12-20 21:08:00 +0000
commitc390ec7befcfeeda8504bdd74eb823b7ab721bf3 (patch)
treead1c0164748a96ea5cb0a9b546585b7dd1c371f2 /src/mapreader.cpp
parent609d235de3435fdc768207e59a2ee85172f291ba (diff)
downloadmanaserv-c390ec7befcfeeda8504bdd74eb823b7ab721bf3.tar.gz
manaserv-c390ec7befcfeeda8504bdd74eb823b7ab721bf3.tar.bz2
manaserv-c390ec7befcfeeda8504bdd74eb823b7ab721bf3.tar.xz
manaserv-c390ec7befcfeeda8504bdd74eb823b7ab721bf3.zip
Adding command line argument parsing and log verbosity level handling.
Diffstat (limited to 'src/mapreader.cpp')
-rw-r--r--src/mapreader.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mapreader.cpp b/src/mapreader.cpp
index ce41208d..1dd56eb7 100644
--- a/src/mapreader.cpp
+++ b/src/mapreader.cpp
@@ -120,7 +120,7 @@ Map *MapReader::readMap(const std::string &filename)
if (buffer == NULL)
{
- LOG_ERROR("Error: Map file not found (" << filename.c_str() << ")");
+ LOG_ERROR("Error: Map file not found (" << filename.c_str() << ")", 0);
return NULL;
}
@@ -133,22 +133,22 @@ Map *MapReader::readMap(const std::string &filename)
if (ret == Z_MEM_ERROR)
{
- LOG_ERROR("Error: Out of memory while decompressing map data!");
+ LOG_ERROR("Error: Out of memory while decompressing map data!", 0);
return NULL;
}
else if (ret == Z_VERSION_ERROR)
{
- LOG_ERROR("Error: Incompatible zlib version!");
+ LOG_ERROR("Error: Incompatible zlib version!", 0);
return NULL;
}
else if (ret == Z_DATA_ERROR)
{
- LOG_ERROR("Error: Incorrect zlib compressed data!");
+ LOG_ERROR("Error: Incorrect zlib compressed data!", 0);
return NULL;
}
else if (ret != Z_OK || inflated == NULL)
{
- LOG_ERROR("Error: Unknown error while decompressing map data!");
+ LOG_ERROR("Error: Unknown error while decompressing map data!", 0);
return NULL;
}
@@ -160,14 +160,14 @@ Map *MapReader::readMap(const std::string &filename)
xmlNodePtr node = xmlDocGetRootElement(doc);
if (!node || !xmlStrEqual(node->name, BAD_CAST "map")) {
- LOG_ERROR("Error: Not a map file (" << filename << ")!");
+ LOG_ERROR("Error: Not a map file (" << filename << ")!", 0);
return NULL;
}
return readMap(node, filename);
xmlFreeDoc(doc);
} else {
- LOG_ERROR("Error while parsing map file (" << filename << ")!");
+ LOG_ERROR("Error while parsing map file (" << filename << ")!", 0);
}
return NULL;
@@ -251,7 +251,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
xmlFree(encoding);
if (compression) {
- LOG_WARN("Warning: no layer compression supported!");
+ LOG_WARN("Warning: no layer compression supported!", 0);
xmlFree(compression);
return;
}
@@ -329,7 +329,7 @@ Tileset*
MapReader::readTileset(xmlNodePtr node, const std::string &path, Map *map)
{
if (xmlHasProp(node, BAD_CAST "source")) {
- LOG_WARN("Warning: External tilesets not supported yet.");
+ LOG_WARN("Warning: External tilesets not supported yet.", 0);
return NULL;
}