X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=7dbd016d8717ff8415a1ed63aa8d0f717ffbd54d;hb=4956380d5109fe57722a968ad1ffbf2fa0a5ed2e;hp=e94ed417b689807e580bf20a6925d0371327ef59;hpb=69123d71dacfdd6592c00ead8b92b6441d0f0228;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index e94ed41..7dbd016 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -83,6 +83,8 @@ public:
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
 	Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
 	const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
+	Monster &MonsterAt(std::vector<Monster>::size_type index) { return monsters[index]; }
+	const Monster &MonsterAt(std::vector<Monster>::size_type index) const { return monsters[index]; }
 	void SwapHeroes(std::vector<Hero>::size_type lhs, std::vector<Hero>::size_type rhs);
 	const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
 	const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
@@ -109,8 +111,11 @@ public:
 	bool HeroPositionOccupied(int index) { return index >= 0 && index < int(heroes.size()); }
 	std::vector<Hero> &Heroes() { return heroes; }
 	const std::vector<Hero> &Heroes() const { return heroes; }
+	std::vector<Monster> &Monsters() { return monsters; }
+	const std::vector<Monster> &Monsters() const { return monsters; }
 
 	void SetRunaway() { ranAway = true; }
+	void ClearAllAttacks();
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -143,9 +148,9 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
-	std::vector<graphics::Menu<const common::Spell *> > spellMenus;
+	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
-	std::vector<graphics::Menu<const common::Item *> > ikariMenus;
+	graphics::Menu<const common::Item *> ikariMenus[4];
 	HeroTag heroTags[4];
 	geometry::Point<int> heroTagPositions[4];
 	AttackChoice attackChoices[4];