summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-07 22:15:37 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-07 22:22:35 +0300
commitfa4c5d79b04a319550996c48448cd799fe7fde56 (patch)
tree50ae3263bab7adc6f6a6381f27cf9ebbdbd83b88
parent7229e881f1a0f7910eb84637d123b33fa9d7ce07 (diff)
downloadmv-fa4c5d79b04a319550996c48448cd799fe7fde56.tar.gz
mv-fa4c5d79b04a319550996c48448cd799fe7fde56.tar.bz2
mv-fa4c5d79b04a319550996c48448cd799fe7fde56.tar.xz
mv-fa4c5d79b04a319550996c48448cd799fe7fde56.zip
Remove useless casts from missile-particle attributes.
-rw-r--r--src/gui/windows/skilldialog.cpp8
-rw-r--r--src/resources/beingcommon.cpp4
-rw-r--r--src/resources/db/itemdb.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 056256938..f48baaf83 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -568,8 +568,8 @@ void SkillDialog::loadSkillData(XmlNodeConstPtr node,
node, "missile-particle", "");
missile.z = static_cast<float>(XML::getFloatProperty(
node, "missile-z", 32.0f));
- missile.lifeTime = static_cast<float>(XML::getProperty(
- node, "missile-lifetime", 500));
+ missile.lifeTime = XML::getProperty(
+ node, "missile-lifetime", 500);
missile.speed = static_cast<float>(XML::getFloatProperty(
node, "missile-speed", 7.0f));
missile.dieDistance = static_cast<float>(
@@ -580,8 +580,8 @@ void SkillDialog::loadSkillData(XmlNodeConstPtr node,
node, "castingMissile-particle", "");
castingMissile.z = static_cast<float>(XML::getFloatProperty(
node, "castingMissile-z", 32.0f));
- castingMissile.lifeTime = static_cast<float>(XML::getProperty(
- node, "castingMissile-lifetime", 500));
+ castingMissile.lifeTime = XML::getProperty(
+ node, "castingMissile-lifetime", 500);
castingMissile.speed = static_cast<float>(XML::getFloatProperty(
node, "castingMissile-speed", 7.0f));
castingMissile.dieDistance = static_cast<float>(
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 1154de44c..e2294f37d 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -233,8 +233,8 @@ bool BeingCommon::readObjectNodes(XmlNodePtrConst &spriteNode,
const float missileZ = static_cast<float>(XML::getFloatProperty(
spriteNode, "missile-z", 32.0f));
- const int missileLifeTime = static_cast<float>(XML::getProperty(
- spriteNode, "missile-lifetime", 500));
+ const int missileLifeTime = XML::getProperty(
+ spriteNode, "missile-lifetime", 500);
const float missileSpeed = static_cast<float>(XML::getFloatProperty(
spriteNode, "missile-speed", 7.0f));
const float missileDieDistance = static_cast<float>(
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index b25e2d7e8..6a7ed29eb 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -347,8 +347,8 @@ void ItemDB::loadXmlFile(const std::string &fileName,
node, "missile-particle", "");
float missileZ = static_cast<float>(XML::getFloatProperty(
node, "missile-z", 32.0f));
- int missileLifeTime = static_cast<float>(XML::getProperty(
- node, "missile-lifetime", 500));
+ int missileLifeTime = XML::getProperty(
+ node, "missile-lifetime", 500);
float missileSpeed = static_cast<float>(XML::getFloatProperty(
node, "missile-speed", 7.0f));
float missileDieDistance = static_cast<float>(XML::getFloatProperty(