added dummy state that echoes all selected attacks

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 4b0ffcff43c591f41f754b62e3f983208ef1479c..347afc3f744e7bc3bfb2cec893c16f9aee48288e 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -21,13 +21,13 @@
 #include "../graphics/Menu.h"
 
 #include <vector>
-#include <string>
 #include <SDL.h>
 
 namespace app { class Input; }
 namespace common {
        class Inventory;
        class Item;
+       class Spell;
 }
 namespace graphics {
        class Font;
@@ -51,7 +51,8 @@ public:
        , res(res)
        , attackTypeMenu(res->attackIcons)
        , moveMenu(res->moveIcons)
-       , activeHero(-1) { }
+       , activeHero(-1)
+       , ranAway(false) { }
 
 public:
        void AddMonster(const Monster &);
@@ -65,7 +66,7 @@ public:
 
        virtual void Resize(int width, int height);
 
-       virtual void HandleInput(const app::Input &);
+       virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
@@ -80,16 +81,42 @@ public:
        void PreviousHero() { --activeHero; }
        Hero &ActiveHero() { return heroes[activeHero]; }
        const Hero &ActiveHero() const { return heroes[activeHero]; }
+       Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
+       const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
+       Monster &MonsterAt(std::vector<Monster>::size_type index) { return monsters[index]; }
+       const Monster &MonsterAt(std::vector<Monster>::size_type index) const { return monsters[index]; }
+       void SwapHeroes(std::vector<Hero>::size_type lhs, std::vector<Hero>::size_type rhs);
+       const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
+       const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
+       const geometry::Point<int> &HeroTagPositionAt(std::vector<Hero>::size_type index) const { return heroTagPositions[index]; }
        bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
        void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
+       AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
+       const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
+       const AttackChoice &AttackChoiceAt(std::vector<Hero>::size_type index) const { return attackChoices[index]; }
+       TargetSelection &ActiveHeroTargets() { return attackChoices[activeHero].Selection(); }
+       const TargetSelection &ActiveHeroTargets() const { return attackChoices[activeHero].Selection(); }
        bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
-       graphics::Menu</* Spell */ void *> &GetSpellMenu() { return spellMenus[activeHero]; }
-       const graphics::Menu</* Spell */ void *> &GetSpellMenu() const { return spellMenus[activeHero]; }
-       graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() { return ikariMenus[activeHero]; }
-       const graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
+
+       graphics::Menu<const common::Spell *> &GetSpellMenu() { return spellMenus[activeHero]; }
+       const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return spellMenus[activeHero]; }
+       graphics::Menu<const common::Item *> &GetIkariMenu() { return ikariMenus[activeHero]; }
+       const graphics::Menu<const common::Item *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
        graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
        const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
+       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) { return index >= 0 && index < int(heroes.size()); }
+       std::vector<Hero> &Heroes() { return heroes; }
+       const std::vector<Hero> &Heroes() const { return heroes; }
+       std::vector<Monster> &Monsters() { return monsters; }
+       const std::vector<Monster> &Monsters() const { return monsters; }
+
+       void SetRunaway() { ranAway = true; }
+       void ClearAllAttacks();
+
 public:
        geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
                return geometry::Vector<int>(
@@ -105,6 +132,8 @@ public:
        void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
+       void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
+       void LoadIkariMenu(std::vector<Hero>::size_type heroIndex);
        void LoadInventory();
 
 private:
@@ -114,17 +143,19 @@ 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<Hero> heroes;
-       std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
+       std::vector<graphics::Menu<const common::Spell *> > spellMenus;
        graphics::Menu<const common::Item *> itemMenu;
-       std::vector<std::string> itemMenuStrings;
-       std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
-       std::vector<HeroTag> heroTags;
-       std::vector<AttackChoice> attackChoices;
+       std::vector<graphics::Menu<const common::Item *> > ikariMenus;
+       HeroTag heroTags[4];
+       geometry::Point<int> heroTagPositions[4];
+       AttackChoice attackChoices[4];
        int activeHero;
+       bool ranAway;
 
 };