X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=9f30fb5a1d439effc3b4ef8857ac1d7d69d1df60;hb=9a273798937710928304fdcc5e33a78c6f8b48be;hp=578098fa40f4d6c86c1ee41628be71ba231314fe;hpb=9d5e525f2bd9035e9add815e287313d09c1bf0fd;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 578098f..9f30fb5 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -22,6 +22,7 @@ #include "../graphics/Animation.h" #include "../graphics/Menu.h" +#include #include #include @@ -57,7 +58,9 @@ public: , numHeroes(0) , activeHero(-1) , attackCursor(-1) - , ranAway(false) { } + , expReward(0) + , goldReward(0) + , ranAway(false) { assert(background && res); } public: void AddMonster(const Monster &); @@ -75,6 +78,7 @@ public: virtual void UpdateWorld(float deltaT); virtual void Render(SDL_Surface *); + // TODO: turn this mess into a well stuctured interface public: const Resources &Res() const { return *res; } AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; } @@ -94,19 +98,21 @@ 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]; } - - const HeroTag &HeroTagAt(int index) const { return heroTags[index]; } - const geometry::Point &HeroTagPositionAt(int index) const { 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]; } + 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 { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; } + const geometry::Point &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[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]; } + AttackChoice &MonsterAttackChoiceAt(int index) { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; } + const AttackChoice &MonsterAttackChoiceAt(int index) const { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; } bool AttackSelectionDone() const { return activeHero >= numHeroes; } int NumHeroes() const { return numHeroes; } @@ -129,10 +135,11 @@ 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]; }; + AttackChoice &CurrentAttackAttackChoice(); void ClearAllAttacks(); bool Victory() const; @@ -185,6 +192,8 @@ private: int numHeroes; int activeHero; int attackCursor; + int expReward; + int goldReward; bool ranAway; };