X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=9f30fb5a1d439effc3b4ef8857ac1d7d69d1df60;hb=9a273798937710928304fdcc5e33a78c6f8b48be;hp=8814663dae807fce9eb3226b065e60e889fdc7bb;hpb=d4609ba1798d82cce128b5985d60cb212b760246;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 8814663..9f30fb5 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -58,6 +58,8 @@ public: , numHeroes(0) , activeHero(-1) , attackCursor(-1) + , expReward(0) + , goldReward(0) , ranAway(false) { assert(background && res); } public: @@ -76,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; } @@ -108,6 +111,8 @@ public: 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; } @@ -187,6 +192,8 @@ private: int numHeroes; int activeHero; int attackCursor; + int expReward; + int goldReward; bool ranAway; };