X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.h;h=f1073f2c8bb0e0261f1021320641c73f3f5d41b0;hb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;hp=3497c04b4ddd184617604fb9f584c045e84e84b4;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git diff --git a/src/battle/Monster.h b/src/battle/Monster.h index 3497c04..f1073f2 100644 --- a/src/battle/Monster.h +++ b/src/battle/Monster.h @@ -9,8 +9,8 @@ #define BATTLE_MONSTER_H_ #include "AttackChoice.h" -#include "Stats.h" #include "../common/fwd.h" +#include "../common/Stats.h" #include "../geometry/Vector.h" #include "../graphics/Animation.h" #include "../graphics/fwd.h" @@ -39,8 +39,8 @@ public: Uint16 Mana() const { return mana; } int RelativeMana(int max) const { return mana * max / maxMana; } - Stats &GetStats() { return stats; } - const Stats &GetStats() const { return stats; } + common::Stats &GetStats() { return stats; } + const common::Stats &GetStats() const { return stats; } Uint16 ExpReward() const { return expReward; } Uint16 GoldReward() const { return goldReward; } @@ -71,7 +71,7 @@ public: void SetHealth(Uint16 h) { health = h; } void SetMaxMana(Uint16 m) { maxMana = m; } void SetMana(Uint16 m) { mana = m; } - void SetStats(const Stats &s) { stats = s; } + void SetStats(const common::Stats &s) { stats = s; } void SetReward(Uint16 exp, Uint16 gold) { expReward = exp; goldReward = gold; } void SetMeleeAnimation(const graphics::Animation *a) { meleeAnimation = a; } @@ -104,7 +104,7 @@ private: int maxHealth, health; int maxMana, mana; - Stats stats; + common::Stats stats; int expReward, goldReward;