X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=db221b43324293f29d1fe3e8df0303c2878f6945;hb=c98665e575f49251dd9b123204063eefdc10e681;hp=6aeaae5f7e4ee98ac845c79c26f558abefba03c4;hpb=c484a03fda545a6803be63aa0a35f23c26cc8e2f;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 6aeaae5..db221b4 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -83,16 +83,16 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 
 	int tagHeight(attackTypeMenu.Height());
 	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
-	int xOffset((BackgroundWidth() - 2 * tagWidth) / 2);
-	heroTagPositions[0] = Point<int>(xOffset, BackgroundHeight() - 2 * tagHeight);
-	heroTagPositions[1] = Point<int>(xOffset + tagWidth, BackgroundHeight() - 2 * tagHeight);
-	heroTagPositions[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight);
-	heroTagPositions[3] = Point<int>(xOffset + tagWidth, BackgroundHeight() - tagHeight);
+	int xOffset((Width() - 2 * tagWidth) / 2);
+	heroTagPositions[0] = Point<int>(xOffset, Height() - 2 * tagHeight);
+	heroTagPositions[1] = Point<int>(xOffset + tagWidth, Height() - 2 * tagHeight);
+	heroTagPositions[2] = Point<int>(xOffset, Height() - tagHeight);
+	heroTagPositions[3] = Point<int>(xOffset + tagWidth, Height() - tagHeight);
 
 	tagHeight = res->normalFont->CharHeight() * 4 + res->smallHeroTagFrame->BorderHeight() * 2;
 	tagWidth = res->normalFont->CharWidth() * 6 + res->smallHeroTagFrame->BorderWidth() * 2;
-	xOffset = (BackgroundWidth() - 4 * tagWidth) / 2;
-	int yOffset(BackgroundHeight() - tagHeight);
+	xOffset = (Width() - 4 * tagWidth) / 2;
+	int yOffset(Height() - tagHeight);
 	smallHeroTagPositions[0] = Point<int>(xOffset, yOffset);
 	smallHeroTagPositions[1] = Point<int>(xOffset + 2 * tagWidth, yOffset);
 	smallHeroTagPositions[2] = Point<int>(xOffset + tagWidth, yOffset);
@@ -233,6 +233,30 @@ void BattleState::ClearAllAttacks() {
 }
 
 
+class OrderCompare {
+	public:
+		OrderCompare(BattleState *battle) : battle(battle) { }
+		bool operator ()(const BattleState::Order &lhs, const BattleState::Order &rhs) {
+			int lagl(lhs.isMonster ? battle->MonsterAt(lhs.index).Agility() : battle->HeroAt(lhs.index).Agility());
+			int ragl(rhs.isMonster ? battle->MonsterAt(rhs.index).Agility() : battle->HeroAt(rhs.index).Agility());
+			return lagl > ragl;
+		}
+	private:
+		BattleState *battle;
+};
+
+void BattleState::WriteOrder(std::vector<Order> &order) {
+	order.reserve(monsters.size() + NumHeroes());
+	for (int i(0); i < numHeroes; ++i) {
+		order.push_back(Order(i, false));
+	}
+	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
+		order.push_back(Order(i, true));
+	}
+	std::sort(order.begin(), order.end(), OrderCompare(this));
+}
+
+
 void BattleState::HandleEvents(const Input &input) {
 
 }
@@ -266,8 +290,14 @@ void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset)
 
 void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 	for (int i(0); i < numHeroes; ++i) {
-		int row(heroes[i].Health() > 0 ? 0 : 2);
-		heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 1, row);
+		if (heroes[i].AttackAnimation() && heroes[i].AttackAnimation()->Running()) {
+			heroes[i].AttackAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+		} else if (heroes[i].SpellAnimation() && heroes[i].SpellAnimation()->Running()) {
+			heroes[i].SpellAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+		} else {
+			int row(heroes[i].Health() > 0 ? 0 : 2);
+			heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 1, row);
+		}
 	}
 }
 
@@ -286,8 +316,8 @@ void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector<int> &of
 
 	SDL_Rect rect;
 	rect.x = offset.X();
-	rect.y = offset.Y() + BackgroundHeight() - tagHeight;
-	rect.w = BackgroundWidth();
+	rect.y = offset.Y() + Height() - tagHeight;
+	rect.w = Width();
 	rect.h = tagHeight;
 	SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, 0, 0, 0));
 	rect.y += res->normalFont->CharHeight() / 8;