X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=a901c63f68ccf028063fec9ebc8a21d3313376be;hb=04b582180c8f86f50f08f5141a2514a1fcda3e01;hp=f5bf9cb1b915ee9e60de2a3516104adac9842052;hpb=35f8a25fc914f10a8e987357bab94584af0992fb;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index f5bf9cb..a901c63 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -15,6 +15,7 @@ #include "Monster.h" #include "MoveMenu.h" #include "Resources.h" +#include "SmallHeroTag.h" #include "../app/State.h" #include "../geometry/Point.h" #include "../geometry/Vector.h" @@ -106,12 +107,13 @@ public: bool AttackSelectionDone() const { return activeHero >= numHeroes; } int NumHeroes() const { return numHeroes; } + 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; } const std::vector > &HeroesPositions() const { return heroesPositions; } - bool HeroPositionOccupied(int index) { return index >= 0 && index < numHeroes; } + bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; } void SetRunaway() { ranAway = true; } void ClearAllAttacks(); @@ -129,6 +131,7 @@ public: void RenderMonsters(SDL_Surface *screen, const geometry::Vector &offset); void RenderHeroes(SDL_Surface *screen, const geometry::Vector &offset); void RenderHeroTags(SDL_Surface *screen, const geometry::Vector &offset); + void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector &offset); private: void LoadSpellMenu(std::vector::size_type heroIndex); @@ -151,7 +154,9 @@ private: graphics::Menu itemMenu; graphics::Menu ikariMenus[4]; HeroTag heroTags[4]; + SmallHeroTag smallHeroTags[4]; geometry::Point heroTagPositions[4]; + geometry::Point smallHeroTagPositions[4]; AttackChoice attackChoices[4]; int numHeroes; int activeHero;