X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=d0a002716268f1d9209988556e0e56f77a8c3ab1;hb=1162be37102b24df11f469495c0184f3f9a26ba0;hp=a901c63f68ccf028063fec9ebc8a21d3313376be;hpb=04b582180c8f86f50f08f5141a2514a1fcda3e01;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index a901c63..d0a0027 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -19,6 +19,7 @@ #include "../app/State.h" #include "../geometry/Point.h" #include "../geometry/Vector.h" +#include "../graphics/Animation.h" #include "../graphics/Menu.h" #include @@ -84,8 +85,7 @@ public: graphics::Menu &GetItemMenu() { return itemMenu; } const graphics::Menu &GetItemMenu() const { return itemMenu; } - bool HasMoreHeroes() const { return activeHero < numHeroes; } - void NextHero() { ++activeHero; } + void NextHero(); bool BeforeFirstHero() const { return activeHero < 0; } void PreviousHero() { --activeHero; } void SwapHeroes(int lhs, int rhs); @@ -118,6 +118,15 @@ public: void SetRunaway() { ranAway = true; } void ClearAllAttacks(); + struct Order { + Order(int index, bool isMonster) + : index(index), isMonster(isMonster) { } + int index; + bool isMonster; + }; + + void WriteOrder(std::vector &); + public: geometry::Vector CalculateScreenOffset(SDL_Surface *screen) const { return geometry::Vector(