From bc05e688174d24f3b2b01ee0ab5ce73787817832 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jun 2018 04:13:26 +0300 Subject: Fix some style issues after automatic checks. --- src/resources/db/groupdb.cpp | 2 -- src/resources/mapreader.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/resources') 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) -- cgit v1.2.3-70-g09d2