summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-10-29 02:02:04 +0300
committerAndrei Karas <akaras@inbox.ru>2018-10-29 02:02:04 +0300
commita6d18b282ab916c6536dc25516affeb9200043b6 (patch)
tree9980735a47cb2118999fb4f4dceaa52bf9f4fae7 /src/resources/db
parent98c74738f21d7ae256f1273b6c1614ee64e2a3ad (diff)
downloadplus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.gz
plus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.bz2
plus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.xz
plus-a6d18b282ab916c6536dc25516affeb9200043b6.zip
Fix code style.s20181102
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/deaddb.cpp2
-rw-r--r--src/resources/db/itemdb.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp
index 5f5e2db5a..cd921d05a 100644
--- a/src/resources/db/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -102,7 +102,7 @@ void DeadDB::unload()
std::string DeadDB::getRandomString()
{
const size_t sz = mMessages.size();
- if (sz == 0u)
+ if (sz == 0U)
return std::string();
return translator->getStr(mMessages[rand() % sz]);
}
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index d6889bd83..78ac033a6 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -369,13 +369,13 @@ void ItemDB::loadXmlFile(const std::string &fileName,
std::string missileParticle = XML::getProperty(
node, "missile-particle", "");
float missileZ = XML::getFloatProperty(
- node, "missile-z", 32.0f);
+ node, "missile-z", 32.0F);
int missileLifeTime = XML::getProperty(
node, "missile-lifetime", 500);
float missileSpeed = XML::getFloatProperty(
- node, "missile-speed", 7.0f);
+ node, "missile-speed", 7.0F);
float missileDieDistance = XML::getFloatProperty(
- node, "missile-diedistance", 8.0f);
+ node, "missile-diedistance", 8.0F);
int hitEffectId = XML::getProperty(node, "hit-effect-id",
paths.getIntValue("hitEffectId"));
int criticalEffectId = XML::getProperty(