X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=40dd51d9f671d8b79fb8a9c63d72d2586ad62c14;hb=854e5229c3f30bf88aa08d7f0aff56a1411c3367;hp=cfec6129a8cb0f47e81589e689a5182280f6a34e;hpb=e27fcf693589ede18b753d5f64f9dfecfe6344bd;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index cfec612..40dd51d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -15,9 +15,11 @@
 #include "Monster.h"
 #include "MoveMenu.h"
 #include "Resources.h"
+#include "SmallHeroTag.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
+#include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
 #include <vector>
@@ -83,8 +85,7 @@ public:
 	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
 	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
-	bool HasMoreHeroes() const { return activeHero < numHeroes; }
-	void NextHero() { ++activeHero; }
+	void NextHero();
 	bool BeforeFirstHero() const { return activeHero < 0; }
 	void PreviousHero() { --activeHero; }
 	void SwapHeroes(int lhs, int rhs);
@@ -93,8 +94,8 @@ public:
 
 	Hero &HeroAt(int index) { return heroes[index]; }
 	const Hero &HeroAt(int 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]; }
+	Monster &MonsterAt(int index) { return monsters[index]; }
+	const Monster &MonsterAt(int index) const { return monsters[index]; }
 
 	const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
 	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
@@ -105,13 +106,14 @@ public:
 	const AttackChoice &AttackChoiceAt(int index) const { return attackChoices[index]; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
+	int NumHeroes() const { return numHeroes; }
+	int MaxHeroes() const { return 4; }
+	int MaxMonsters() const { return monsters.size(); }
+
 	const std::vector<geometry::Point<int> > &MonsterPositions() const { return monsterPositions; }
 	bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; }
 	const std::vector<geometry::Point<int> > &HeroesPositions() const { return heroesPositions; }
-	bool HeroPositionOccupied(int index) { return index >= 0 && index < numHeroes; }
-	int NumHeroes() const { return numHeroes; }
-	std::vector<Monster> &Monsters() { return monsters; }
-	const std::vector<Monster> &Monsters() const { return monsters; }
+	bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; }
 
 	void SetRunaway() { ranAway = true; }
 	void ClearAllAttacks();
@@ -129,6 +131,7 @@ public:
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
 	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
@@ -151,7 +154,9 @@ private:
 	graphics::Menu<const common::Item *> itemMenu;
 	graphics::Menu<const common::Item *> ikariMenus[4];
 	HeroTag heroTags[4];
+	SmallHeroTag smallHeroTags[4];
 	geometry::Point<int> heroTagPositions[4];
+	geometry::Point<int> smallHeroTagPositions[4];
 	AttackChoice attackChoices[4];
 	int numHeroes;
 	int activeHero;