diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
| commit | c5327f3b1d10171ff2a97546ea49e350b1725c24 (patch) | |
| tree | 2cd1ada4c5db1ad3452bcf7aca9c424c0ed848d2 /src/resources/mapreader.cpp | |
| parent | db1e60556c72b1b87ff2a384c556ccca724c46d6 (diff) | |
| parent | 6bed768bc416eed0212b62e70731d2c40cd1b69b (diff) | |
| download | plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.gz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.bz2 plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.xz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index a1b087102..1e94b06f2 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -900,7 +900,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, } // create animation - if (!set) + if (!set || !config.getBoolValue("playMapAnimations")) continue; Animation *ani = new Animation; |