diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-09 00:18:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-09 00:18:08 +0300 |
| commit | c6ac11341bd99cbe5eeb4275b9b2473e21338d5e (patch) | |
| tree | bb7589c232ad54bfd037ae016ee0991342ebccfa /src/resources | |
| parent | 9f1470325518a8ee5b6c0c2c1254ab4dccac0f63 (diff) | |
| download | plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.gz plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.bz2 plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.xz plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.zip | |
Fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 4 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index c2da00732..10bc6136f 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -152,8 +152,8 @@ void AtlasManager::loadImages(const StringVect &files, if (rw != nullptr) { Image *const image = d != nullptr ? - surfaceImageHelper->load(rw, *d) : - surfaceImageHelper->load(rw); + surfaceImageHelper->load(rw, *d) + : surfaceImageHelper->load(rw); if (image != nullptr) { diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index b795b5e0f..22fcd7bd8 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -564,8 +564,8 @@ inline static void setTile(Map *const map, { case MapLayerType::TILES: { - Image *const img = set != nullptr ? set->get(gid - set->getFirstGid()) - : nullptr; + Image *const img = set != nullptr ? + set->get(gid - set->getFirstGid()) : nullptr; if (layer != nullptr) layer->setTile(x, y, img); break; @@ -1192,7 +1192,8 @@ Tileset *MapReader::readTileset(XmlNodePtr node, } // create animation - if ((set == nullptr) || !config.getBoolValue("playMapAnimations")) + if (set == nullptr || + !config.getBoolValue("playMapAnimations")) { delete ani; continue; |