X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=d22d6894d314bb44f98223bce046ae7edc313a76;hb=19f0f64186c38fab38fe802bc1b797b1418d573a;hp=f5268dda931b1403745f6f15dc6709ddac5f6cf2;hpb=cded7d136b41e22f363ec702f2288491c0006e3a;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index f5268dd..d22d689 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -78,7 +78,6 @@ 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; } @@ -109,7 +108,6 @@ public: int MaxHeroes() const { return 4; } int MaxMonsters() const { return monsters.size(); } - const std::vector > &MonsterPositions() const { return monsterPositions; } bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; } bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; } @@ -161,8 +159,6 @@ private: const Resources *res; AttackTypeMenu attackTypeMenu; MoveMenu moveMenu; - // TODO: combine all data about heros or monsters - std::vector > monsterPositions; std::vector monsters; std::vector attackOrder; Hero heroes[4];