summaryrefslogtreecommitdiff
path: root/src/resources/beinginfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/beinginfo.h')
-rw-r--r--src/resources/beinginfo.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 52390976..b4529b2f 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -32,16 +32,16 @@
#include <vector>
struct Attack {
- std::string action;
- std::string particleEffect;
- std::string missileParticle;
+ std::string mAction;
+ int mEffectId;
+ std::string mMissileParticleFilename;
- Attack(std::string action, std::string particleEffect,
- std::string missileParticle)
+ Attack(std::string action, int effectId,
+ std::string missileParticleFilename)
{
- this->action = action;
- this->particleEffect = particleEffect;
- this->missileParticle = missileParticle;
+ mAction = action;
+ mEffectId = effectId;
+ mMissileParticleFilename = missileParticleFilename;
}
};
@@ -95,11 +95,10 @@ class BeingInfo
const std::string &getSound(SoundEvent event) const;
- void addAttack(int id, std::string action,
- const std::string &particleEffect,
- const std::string &missileParticle);
+ void addAttack(int id, std::string action, int effectId,
+ const std::string &missileParticleFilename);
- const Attack *getAttack(int type) const;
+ const Attack *getAttack(int id) const;
void setWalkMask(unsigned char mask)
{ mWalkMask = mask; }