← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/resources/beinginfo.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-08-13 10:18:49 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20130813101849-gna1clq5vxvb8p5f
Tags: 1.3.8.4-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/beinginfo.cpp
32
32
 
33
33
BeingInfo *BeingInfo::unknown = nullptr;
34
34
Attack *BeingInfo::empty = new Attack(SpriteAction::ATTACK,
 
35
    SpriteAction::ATTACKSKY, SpriteAction::ATTACKWATER,
35
36
    -1, -1, -1, -1, std::string());
36
37
 
37
38
BeingInfo::BeingInfo() :
51
52
    mTargetOffsetY(0),
52
53
    mNameOffsetX(0),
53
54
    mNameOffsetY(0),
 
55
    mHpBarOffsetX(0),
 
56
    mHpBarOffsetY(0),
54
57
    mMaxHP(0),
55
58
    mSortOffsetY(0),
56
59
    mDeadSortOffsetY(31),
126
129
    return (i == mAttacks.end()) ? empty : (*i).second;
127
130
}
128
131
 
129
 
void BeingInfo::addAttack(const int id, std::string action, const int effectId,
130
 
                          const int hitEffectId, const int criticalHitEffectId,
 
132
void BeingInfo::addAttack(const int id, std::string action,
 
133
                          std::string skyAction, std::string waterAction,
 
134
                          const int effectId, const int hitEffectId,
 
135
                          const int criticalHitEffectId,
131
136
                          const int missEffectId,
132
137
                          const std::string &missileParticle)
133
138
{
134
139
    delete mAttacks[id];
135
 
    mAttacks[id] = new Attack(action, effectId, hitEffectId,
136
 
        criticalHitEffectId, missEffectId, missileParticle);
 
140
    mAttacks[id] = new Attack(action, skyAction, waterAction, effectId,
 
141
        hitEffectId, criticalHitEffectId, missEffectId, missileParticle);
137
142
}
138
143
 
139
144
void BeingInfo::clear()