diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-07 22:00:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-07 22:00:29 +0300 |
| commit | 344a88446cc1e15780de41c1187f40d18de7b60e (patch) | |
| tree | 06173ee66396951b39cf6b8099898b3c7b35cf9c | |
| parent | ad6c177a459cf5afb3ad88169d8ba6b1c47fff93 (diff) | |
| download | mv-344a88446cc1e15780de41c1187f40d18de7b60e.tar.gz mv-344a88446cc1e15780de41c1187f40d18de7b60e.tar.bz2 mv-344a88446cc1e15780de41c1187f40d18de7b60e.tar.xz mv-344a88446cc1e15780de41c1187f40d18de7b60e.zip | |
Adjust default missile particle lifetime.
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 4 | ||||
| -rw-r--r-- | src/resources/beingcommon.cpp | 2 | ||||
| -rw-r--r-- | src/resources/beinginfo.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/itemdb.cpp | 4 | ||||
| -rw-r--r-- | src/resources/missileinfo.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index b4699c525..056256938 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -569,7 +569,7 @@ void SkillDialog::loadSkillData(XmlNodeConstPtr node, missile.z = static_cast<float>(XML::getFloatProperty( node, "missile-z", 32.0f)); missile.lifeTime = static_cast<float>(XML::getProperty( - node, "missile-lifetime", 3000)); + node, "missile-lifetime", 500)); missile.speed = static_cast<float>(XML::getFloatProperty( node, "missile-speed", 7.0f)); missile.dieDistance = static_cast<float>( @@ -581,7 +581,7 @@ void SkillDialog::loadSkillData(XmlNodeConstPtr node, castingMissile.z = static_cast<float>(XML::getFloatProperty( node, "castingMissile-z", 32.0f)); castingMissile.lifeTime = static_cast<float>(XML::getProperty( - node, "castingMissile-lifetime", 3000)); + 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 7e5fb9481..1154de44c 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -234,7 +234,7 @@ 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", 3000)); + 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/beinginfo.cpp b/src/resources/beinginfo.cpp index 93d8a5d4b..f077beada 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -55,7 +55,7 @@ Attack *BeingInfo::empty = new Attack(SpriteAction::ATTACK, 32.0F, 7.0F, 8.0F, - 3000); + 500); BeingInfo::BeingInfo() : mDisplay(), diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index ded7e59f2..68cb5b3bb 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -348,7 +348,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, float missileZ = static_cast<float>(XML::getFloatProperty( node, "missile-z", 32.0f)); int missileLifeTime = static_cast<float>(XML::getProperty( - node, "missile-lifetime", 3000)); + node, "missile-lifetime", 500)); float missileSpeed = static_cast<float>(XML::getFloatProperty( node, "missile-speed", 7.0f)); float missileDieDistance = static_cast<float>(XML::getFloatProperty( @@ -502,7 +502,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, missileParticle = inheritMissile.particle; if (missileZ == 32.0F) missileZ = inheritMissile.z; - if (missileLifeTime == 3000) + if (missileLifeTime == 500) missileLifeTime = inheritMissile.lifeTime; if (missileSpeed == 7.0F) missileSpeed = inheritMissile.speed; diff --git a/src/resources/missileinfo.h b/src/resources/missileinfo.h index 41429f61c..262a2fb83 100644 --- a/src/resources/missileinfo.h +++ b/src/resources/missileinfo.h @@ -32,7 +32,7 @@ struct MissileInfo final z(32.0F), speed(7.0F), dieDistance(8.0F), - lifeTime(3000) + lifeTime(500) { } A_DELETE_COPY(MissileInfo) |