moved some Hero related stuff out of BattleState

[l2e.git] / src / battle / Hero.h

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index fd90a1bb175b9e879e791111e3bd68e3d594f9d4..275db6da22a160ef1cf8c4815ad55a0da7145248 100644 (file)
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,8 +8,10 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "AttackChoice.h"
 #include "Stats.h"
 #include "../graphics/Animation.h"
+#include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
@@ -83,6 +85,14 @@ public:
        const graphics::Animation *AttackAnimation() const { return attackAnimation; }
        const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
+       graphics::Menu<const common::Spell *> &SpellMenu() { return spellMenu; }
+       const graphics::Menu<const common::Spell *> &SpellMenu() const { return spellMenu; }
+       graphics::Menu<const common::Item *> &IkariMenu() { return ikariMenu; }
+       const graphics::Menu<const common::Item *> &IkariMenu() const { return ikariMenu; }
+
+       AttackChoice &GetAttackChoice() { return attackChoice; }
+       const AttackChoice &GetAttackChoice() const { return attackChoice; }
+
 // temporary setters until loader is implemented
 public:
        void SetName(const char *n) { name = n; }
@@ -127,6 +137,11 @@ private:
 
        graphics::AnimationRunner animation;
 
+       graphics::Menu<const common::Spell *> spellMenu;
+       graphics::Menu<const common::Item *> ikariMenu;
+
+       AttackChoice attackChoice;
+
        // TODO: vector does not seem to be a good choice
        std::vector<const common::Spell *> spells;