diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
| commit | 458401d64fbe500295cc8e903702638fde0ab934 (patch) | |
| tree | 3d1c606f118dba2b4f38fa80614bf30fdc12277c /src/resources/mapreader.cpp | |
| parent | e6cd1f9cb82811d05e08aef0493eeba9cc41a95d (diff) | |
| parent | d4bb2d1d0e82ca9d046f9b2346a7893ca11e8d9c (diff) | |
| download | mana-458401d64fbe500295cc8e903702638fde0ab934.tar.gz mana-458401d64fbe500295cc8e903702638fde0ab934.tar.bz2 mana-458401d64fbe500295cc8e903702638fde0ab934.tar.xz mana-458401d64fbe500295cc8e903702638fde0ab934.zip | |
Merge branch '0.5'
Translation file updates ignored.
Conflicts:
src/client.cpp
src/commandhandler.cpp
src/gui/popupmenu.cpp
src/localplayer.cpp
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 14021406..1dd12723 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -275,9 +275,11 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) if (encoding == "base64") { - if (!compression.empty() && compression != "gzip" && compression != "zlib") + if (!compression.empty() && compression != "gzip" + && compression != "zlib") { - logger->log("Warning: only gzip layer compression supported!"); + logger->log("Warning: only gzip or zlib layer " + "compression supported!"); return; } |