summaryrefslogtreecommitdiff
path: root/src/resources/attack.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-07 20:44:16 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-07 20:44:16 +0300
commit04716c42ec49bfbb42296dd8980d6f8dd1c09e59 (patch)
treea2cf6e57036d96609a653cf68f2adc9255fec5ba /src/resources/attack.h
parent8ec4e8575001e50ac2917b0a1599d2a6223aa337 (diff)
downloadplus-04716c42ec49bfbb42296dd8980d6f8dd1c09e59.tar.gz
plus-04716c42ec49bfbb42296dd8980d6f8dd1c09e59.tar.bz2
plus-04716c42ec49bfbb42296dd8980d6f8dd1c09e59.tar.xz
plus-04716c42ec49bfbb42296dd8980d6f8dd1c09e59.zip
Add additional attributes to missile particle in attacks.
Diffstat (limited to 'src/resources/attack.h')
-rw-r--r--src/resources/attack.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/resources/attack.h b/src/resources/attack.h
index d9881bf0d..90b3da9c3 100644
--- a/src/resources/attack.h
+++ b/src/resources/attack.h
@@ -23,9 +23,7 @@
#ifndef RESOURCES_ATTACK_H
#define RESOURCES_ATTACK_H
-#include <string>
-
-#include "localconsts.h"
+#include "resources/missileinfo.h"
struct Attack final
{
@@ -37,7 +35,7 @@ struct Attack final
int mHitEffectId;
int mCriticalHitEffectId;
int mMissEffectId;
- std::string mMissileParticle;
+ MissileInfo mMissile;
Attack(const std::string &action,
const std::string &skyAction,
@@ -47,7 +45,11 @@ struct Attack final
const int hitEffectId,
const int criticalHitEffectId,
const int missEffectId,
- const std::string &missileParticle) :
+ const std::string &missileParticle,
+ const float missileZ,
+ const float missileSpeed,
+ const float missileDieDistance,
+ const int missileLifeTime) :
mAction(action),
mSkyAction(skyAction),
mWaterAction(waterAction),
@@ -56,8 +58,13 @@ struct Attack final
mHitEffectId(hitEffectId),
mCriticalHitEffectId(criticalHitEffectId),
mMissEffectId(missEffectId),
- mMissileParticle(missileParticle)
+ mMissile()
{
+ mMissile.particle = missileParticle;
+ mMissile.z = missileZ;
+ mMissile.speed = missileSpeed;
+ mMissile.dieDistance = missileDieDistance;
+ mMissile.lifeTime = missileLifeTime;
}
A_DELETE_COPY(Attack)