X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=3acc0b7699c79dd9ffeaef66c686d263c2a4d29e;hb=c0068263474818f39e704eee12f753c0419f7708;hp=736e2c17ad3f15dbf733220728b53fce1df6a5c8;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 736e2c1..3acc0b7 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -97,9 +97,6 @@ public:
 	Monster &MonsterAt(int index) { return monsters[index]; }
 	const Monster &MonsterAt(int index) const { return monsters[index]; }
 
-	graphics::Animation &HeroAnimationAt(int index) { return heroAnimations[index]; }
-	const graphics::Animation &HeroAnimationAt(int index) const { return heroAnimations[index]; }
-
 	const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
 	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
 
@@ -121,14 +118,23 @@ public:
 	void SetRunaway() { ranAway = true; }
 	void ClearAllAttacks();
 
+	struct Order {
+		Order(int index, bool isMonster)
+		: index(index), isMonster(isMonster) { }
+		int index;
+		bool isMonster;
+	};
+
+	void WriteOrder(std::vector<Order> &);
+
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
 		return geometry::Vector<int>(
 				(screen->w - background->w) / 2,
 				(screen->h - background->h) / 2);
 	}
-	int BackgroundWidth() const { return background->w; }
-	int BackgroundHeight() const { return background->h; }
+	int Width() const { return background->w; }
+	int Height() const { return background->h; }
 
 	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
@@ -153,7 +159,6 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	Hero heroes[4];
-	graphics::Animation heroAnimations[4];
 	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
 	graphics::Menu<const common::Item *> ikariMenus[4];