extracted damage calculation once more

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 4964efb81f788be75e23445c28f2e1e00b09805b..a6ba39829d9f6de2718aace409980542d71b6ce5 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -78,18 +78,13 @@ 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; }
        MoveMenu &GetMoveMenu() { return moveMenu; }
 
-       graphics::Menu<const common::Spell *> &GetSpellMenu() { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero].SpellMenu(); }
-       const graphics::Menu<const common::Spell *> &GetSpellMenu() const { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero].SpellMenu(); }
-       graphics::Menu<const common::Item *> &GetIkariMenu() { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero].IkariMenu(); }
-       const graphics::Menu<const common::Item *> &GetIkariMenu() const { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero].IkariMenu(); }
-       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; }
@@ -113,9 +108,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; }
@@ -157,6 +150,8 @@ public:
 private:
        void LoadInventory();
 
+       void DecideMonsterAttack(Monster &) const;
+       void CalculateDamage(const Stats &attackerStats, TargetSelection &targets) const;
        Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
 
 private:
@@ -166,9 +161,6 @@ private:
        const Resources *res;
        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];