X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=73f3fbc01813c478870d6cb42ff7988b87872c9b;hb=4d0a650b178d81387caa36953ed06cc5d6c28213;hp=a3c0879cedbbace7352a0ad547a090e9be8e41ae;hpb=558fd3d14ad1a9dc347998691a0b300fd334a16a;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index a3c0879..73f3fbc 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -38,8 +38,7 @@ public: , heroesLayout(&heroesLayout) , attackTypeMenu(attackIcons) , moveMenu(moveIcons) - , moveChoice(-1) - , activeHero(0) { } + , activeHero(-1) { } public: void AddMonster(const Monster &); @@ -59,6 +58,9 @@ public: AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; } MoveMenu &GetMoveMenu() { return moveMenu; } + bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); } + void NextHero() { ++activeHero; } + public: geometry::Vector CalculateScreenOffset(SDL_Surface *screen) const { return geometry::Vector( @@ -85,7 +87,6 @@ private: std::vector monsters; std::vector heroes; std::vector heroTags; - int moveChoice; int activeHero; };