diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-06-18 04:13:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-06-18 04:13:26 +0300 |
| commit | bc05e688174d24f3b2b01ee0ab5ce73787817832 (patch) | |
| tree | 93de6e980b161e7dccec2acf98b4621c6c385369 /src/resources | |
| parent | 5e11fb3595e752e37557e3e1a1a0590e033daad3 (diff) | |
| download | manaplus-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.gz manaplus-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.bz2 manaplus-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.xz manaplus-bc05e688174d24f3b2b01ee0ab5ce73787817832.zip | |
Fix some style issues after automatic checks.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/db/groupdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/db/groupdb.cpp b/src/resources/db/groupdb.cpp index 1102b7ec4..a8b75d39f 100644 --- a/src/resources/db/groupdb.cpp +++ b/src/resources/db/groupdb.cpp @@ -410,8 +410,6 @@ bool GroupDb::isAllowCommand(const ServerCommandTypeT command) { const int groupId = localPlayer->getGroupId(); const GroupInfo *const group = GroupDb::getGroup(groupId); - if (group == nullptr) - return false; #ifdef TMWA_SUPPORT // allow any commands for legacy if group > 0 diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 9393e781b..74059a034 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -1120,11 +1120,11 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string source = XML::getProperty( childNode, "source", ""); - const std::string sourceResolved = resolveRelativePath(pathDir, - source); - if (!source.empty()) { + const std::string sourceResolved = resolveRelativePath(pathDir, + source); + Image *const tilebmp = Loader::getImage(sourceResolved); if (tilebmp != nullptr) |