X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=ab9f731a9c838e0d9e5430bb491007c0353b35a3;hb=7263bddbde91d555decd58f043f6b43f54ba2b00;hp=578098fa40f4d6c86c1ee41628be71ba231314fe;hpb=69ed4a9c725c438079ceeed89d49656d808308ce;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 578098f..ab9f731 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -22,6 +22,7 @@
 #include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
+#include <cassert>
 #include <vector>
 #include <SDL.h>
 
@@ -57,7 +58,7 @@ public:
 	, numHeroes(0)
 	, activeHero(-1)
 	, attackCursor(-1)
-	, ranAway(false) { }
+	, ranAway(false) { assert(background && res); }
 
 public:
 	void AddMonster(const Monster &);
@@ -94,19 +95,19 @@ public:
 	Hero &ActiveHero() { return heroes[activeHero]; }
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
 
-	Hero &HeroAt(int index) { return heroes[index]; }
-	const Hero &HeroAt(int index) const { return heroes[index]; }
-	Monster &MonsterAt(int index) { return monsters[index]; }
-	const Monster &MonsterAt(int index) const { return monsters[index]; }
+	Hero &HeroAt(int index) { assert(index >= 0 && index < NumHeroes()); return heroes[index]; }
+	const Hero &HeroAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroes[index]; }
+	Monster &MonsterAt(int index) { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
+	const Monster &MonsterAt(int index) const { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
 
-	const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
-	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
+	const HeroTag &HeroTagAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; }
+	const geometry::Point<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
 
-	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
-	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
-	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
-	AttackChoice &AttackChoiceAt(int index) { return attackChoices[index]; }
-	const AttackChoice &AttackChoiceAt(int index) const { return attackChoices[index]; }
+	bool HasChosenAttackType() const { return ActiveHeroAttackChoice().GetType() != AttackChoice::UNDECIDED; }
+	AttackChoice &ActiveHeroAttackChoice() { return AttackChoiceAt(activeHero); }
+	const AttackChoice &ActiveHeroAttackChoice() const { return AttackChoiceAt(activeHero); }
+	AttackChoice &AttackChoiceAt(int index) { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
+	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
 	int NumHeroes() const { return numHeroes; }
@@ -129,10 +130,10 @@ public:
 
 	void CalculateAttackOrder();
 	void NextAttack();
-	bool AttacksFinished() const { return attackCursor >= int(attackOrder.size()); }
+	bool AttacksFinished() const;
 	void CalculateDamage();
 	void ApplyDamage();
-	const Order &CurrentAttack() const { return attackOrder[attackCursor]; };
+	const Order &CurrentAttack() const { assert(attackCursor >= 0 && attackCursor < int(attackOrder.size())); return attackOrder[attackCursor]; };
 	void ClearAllAttacks();
 
 	bool Victory() const;