moved monster's position to Monster

[l2e.git] / src / battle / BattleState.h

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 27a3af8ae396cd7082a3860f10484c821f13cc54..654e147d8ed60a677be4107f314dbc41783413aa 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -84,8 +84,8 @@ public:
        AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
        MoveMenu &GetMoveMenu() { return moveMenu; }
 
-       graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
-       const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
+       graphics::Menu<const common::Item *> &ItemMenu() { return itemMenu; }
+       const graphics::Menu<const common::Item *> &ItemMenu() const { return itemMenu; }
 
        void NextHero();
        bool BeforeFirstHero() const { return activeHero < 0; }
@@ -109,9 +109,7 @@ public:
        int MaxHeroes() const { return 4; }
        int MaxMonsters() const { return monsters.size(); }
 
-       const std::vector<geometry::Point<int> > &MonsterPositions() const { return monsterPositions; }
        bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; }
-       const std::vector<geometry::Point<int> > &HeroesPositions() const { return heroesPositions; }
        bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; }
 
        void SetRunaway() { ranAway = true; }
@@ -163,8 +161,6 @@ private:
        AttackTypeMenu attackTypeMenu;
        MoveMenu moveMenu;
        // TODO: combine all data about heros or monsters
-       std::vector<geometry::Point<int> > monsterPositions;
-       std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;
        std::vector<Order> attackOrder;
        Hero heroes[4];