X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=d0a002716268f1d9209988556e0e56f77a8c3ab1;hb=1162be37102b24df11f469495c0184f3f9a26ba0;hp=736e2c17ad3f15dbf733220728b53fce1df6a5c8;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 736e2c1..d0a0027 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -97,9 +97,6 @@ public: Monster &MonsterAt(int index) { return monsters[index]; } const Monster &MonsterAt(int index) const { return monsters[index]; } - graphics::Animation &HeroAnimationAt(int index) { return heroAnimations[index]; } - const graphics::Animation &HeroAnimationAt(int index) const { return heroAnimations[index]; } - const HeroTag &HeroTagAt(int index) const { return heroTags[index]; } const geometry::Point &HeroTagPositionAt(int index) const { return heroTagPositions[index]; } @@ -121,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( @@ -153,7 +159,6 @@ private: std::vector > heroesPositions; std::vector monsters; Hero heroes[4]; - graphics::Animation heroAnimations[4]; graphics::Menu spellMenus[4]; graphics::Menu itemMenu; graphics::Menu ikariMenus[4];