summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-14 16:40:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-14 16:40:47 +0300
commitb8b4e4c524331b4deb0a6caa8da004430297c98a (patch)
treea2fd6f1db45e76f08c0e5c1b4e57bbb86efba57b /src/resources
parentc28cd5ffb1ca37a3a6d5ee0a73828dcd092db7f1 (diff)
downloadmv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.gz
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.bz2
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.xz
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.zip
Replace static members usage from pointers to direct classes.
clang-tidy warning: readability-static-accessed-through-instance
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/emotedb.cpp2
-rw-r--r--src/resources/mapreader.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index f25b14c5a..02018d963 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -99,7 +99,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName,
const int id = XML::getProperty(emoteNode, "id", -1);
// skip hight images
- if (id > 19 || (client->isTmw() && id > 13))
+ if (id > 19 || (Client::isTmw() && id > 13))
continue;
if (id == -1)
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index cc9a2917d..4d0b89b3a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -814,10 +814,10 @@ bool MapReader::readCsvLayer(XmlNodeConstPtrConst childNode,
if (hasAnimations)
{
- while (oldPos != csv.npos)
+ while (oldPos != std::string::npos)
{
const size_t pos = csv.find_first_of(',', oldPos);
- if (pos == csv.npos)
+ if (pos == std::string::npos)
return false;
const int gid = atoi(csv.substr(oldPos, pos - oldPos).c_str());
@@ -844,10 +844,10 @@ bool MapReader::readCsvLayer(XmlNodeConstPtrConst childNode,
}
else
{
- while (oldPos != csv.npos)
+ while (oldPos != std::string::npos)
{
const size_t pos = csv.find_first_of(',', oldPos);
- if (pos == csv.npos)
+ if (pos == std::string::npos)
return false;
const int gid = atoi(csv.substr(oldPos, pos - oldPos).c_str());