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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index cfec612..f5bf9cb 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -93,8 +93,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 +105,13 @@ public:
 	const AttackChoice &AttackChoiceAt(int index) const { return attackChoices[index]; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
+	int NumHeroes() const { return numHeroes; }
+	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; }
 
 	void SetRunaway() { ranAway = true; }
 	void ClearAllAttacks();