X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=6c318aaf04138e86c627a94429dcdec23e260911;hb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;hp=4f7a427c6a404a5fbac1ecc3f29de5c1bba936b7;hpb=85ac93ffe31bfeee54aa6167111f1c15f14bc405;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 4f7a427..6c318aa 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -7,6 +7,7 @@
 
 #include "PerformAttacks.h"
 
+#include "../AttackAnimation.h"
 #include "../BattleState.h"
 #include "../Hero.h"
 #include "../Monster.h"
@@ -27,12 +28,15 @@ using app::Application;
 using app::Input;
 using geometry::Point;
 using geometry::Vector;
+using std::vector;
 
 namespace battle {
 
 void PerformAttacks::EnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 	battle->WriteOrder(order);
+	numberAnimation.reserve(battle->MaxMonsters() > battle->NumHeroes() + 1 ? battle->MaxMonsters() : battle->NumHeroes() + 1);
+	numberPosition.reserve(numberAnimation.size());
 }
 
 void PerformAttacks::ExitState(Application &c, SDL_Surface *screen) {
@@ -54,23 +58,12 @@ void PerformAttacks::Resize(int width, int height) {
 
 
 void PerformAttacks::HandleEvents(const Input &input) {
-	if (titleBarTimer.Running() || (moveAnimation && moveAnimation->Running())) return;
-
-	if (moveAnimation) moveAnimation->Stop();
-	titleBarTimer.Clear();
-
-	++cursor;
-
-	while (cursor < int(order.size())) {
-		if (order[cursor].isMonster) {
-			if (battle->MonsterAt(order[cursor].index).Health() > 0) break;
-		} else {
-			if (battle->HeroAt(order[cursor].index).Health() > 0) break;
-		}
-		++cursor;
-	}
-
-	if (cursor >= int(order.size())) {
+	if (attackAnimation) attackAnimation->Update();
+	CheckNumberAnimation();
+	if (HasAnimationsRunning()) return;
+	ResetAnimation();
+	AdvanceCursor();
+	if (Finished()) {
 		battle->ClearAllAttacks();
 		ctrl->PopState();
 		return;
@@ -86,8 +79,27 @@ void PerformAttacks::HandleEvents(const Input &input) {
 
 		switch (ac.GetType()) {
 			case AttackChoice::SWORD:
-				titleBarText = hero.HasWeapon() ? hero.Weapon()->Name() : "Melee attack!";
-				moveAnimation = hero.AttackAnimation();
+				if (hero.HasWeapon()) {
+					titleBarText = hero.Weapon()->Name();
+					moveAnimation = hero.AttackAnimation();
+				} else {
+					titleBarText = "Melee attack!";
+					if (hero.MeleeAnimation()) {
+						moveAnimation = 0;
+						attackAnimation = hero.MeleeAnimation();
+					} else {
+						moveAnimation = hero.AttackAnimation();
+						attackAnimation = 0;
+					}
+				}
+				numberAnimation.push_back(NumberAnimation(15, battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
+				if (ac.Selection().TargetsEnemies()) {
+					numberPosition.push_back(
+							battle->MonsterPositions()[ac.Selection().SingleSelection()]);
+				} else {
+					numberPosition.push_back(
+							battle->HeroesPositions()[ac.Selection().SingleSelection()]);
+				}
 				break;
 			case AttackChoice::MAGIC:
 				titleBarText = ac.GetSpell()->Name();
@@ -118,8 +130,54 @@ void PerformAttacks::HandleEvents(const Input &input) {
 		}
 	}
 
-	titleBarTimer = GraphicsTimers().StartCountdown(1500);
+	if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(1500);
 	if (moveAnimation) moveAnimation->Start(*this);
+	if (attackAnimation) attackAnimation->Start(battle, this);
+}
+
+void PerformAttacks::CheckNumberAnimation() {
+	if (moveAnimation && moveAnimation->Running()) return;
+	if (attackAnimation && !attackAnimation->Finished()) return;
+	if (moveAnimation || attackAnimation) {
+		moveAnimation = 0;
+		attackAnimation = 0;
+		for (vector<NumberAnimation>::iterator i(numberAnimation.begin()), end(numberAnimation.end()); i != end; ++i) {
+			i->Start(*this);
+		}
+	} else {
+		for (vector<NumberAnimation>::iterator i(numberAnimation.begin()), end(numberAnimation.end()); i != end; ++i) {
+			i->CheckTimers(*this);
+		}
+	}
+}
+
+bool PerformAttacks::HasAnimationsRunning() const {
+	if (titleBarTimer.Running()) return true;
+	if (moveAnimation && moveAnimation->Running()) return true;
+	for (vector<NumberAnimation>::const_iterator i(numberAnimation.begin()), end(numberAnimation.end()); i != end; ++i) {
+		if (i->Running()) return true;
+	}
+	return false;
+}
+
+void PerformAttacks::ResetAnimation() {
+	if (moveAnimation) moveAnimation->Stop();
+	if (attackAnimation) attackAnimation = 0;
+	titleBarTimer.Clear();
+	numberAnimation.clear();
+	numberPosition.clear();
+}
+
+void PerformAttacks::AdvanceCursor() {
+	++cursor;
+	while (cursor < int(order.size())) {
+		if (order[cursor].isMonster) {
+			if (battle->MonsterAt(order[cursor].index).Health() > 0) break;
+		} else {
+			if (battle->HeroAt(order[cursor].index).Health() > 0) break;
+		}
+		++cursor;
+	}
 }
 
 
@@ -134,18 +192,29 @@ void PerformAttacks::Render(SDL_Surface *screen) {
 	battle->RenderHeroes(screen, offset);
 	battle->RenderSmallHeroTags(screen, offset);
 	RenderTitleBar(screen, offset);
+	RenderNumbers(screen, offset);
+	if (attackAnimation) attackAnimation->Render(screen, offset);
 }
 
 void PerformAttacks::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offset) {
 	if (!titleBarText || !titleBarTimer.Running()) return;
 
 	int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-	battle->Res().titleFrame->Draw(screen, Point<int>(offset.X(), offset.Y()), battle->BackgroundWidth(), height);
+	battle->Res().titleFrame->Draw(screen, Point<int>(offset.X(), offset.Y()), battle->Width(), height);
 
 	Point<int> textPosition(
-			(battle->BackgroundWidth() - (std::strlen(titleBarText) * battle->Res().titleFont->CharWidth())) / 2,
+			(battle->Width() - (std::strlen(titleBarText) * battle->Res().titleFont->CharWidth())) / 2,
 			battle->Res().titleFrame->BorderHeight());
 	battle->Res().titleFont->DrawString(titleBarText, screen, textPosition + offset);
 }
 
+void PerformAttacks::RenderNumbers(SDL_Surface *screen, const Vector<int> &offset) {
+	for (vector<NumberAnimation>::size_type i(0), end(numberAnimation.size()); i < end; ++i) {
+		if (numberAnimation[i].Running()) {
+			Vector<int> align(numberAnimation[i].Width() / -2, numberAnimation[i].Height() * -3 / 4);
+			numberAnimation[i].Draw(screen, numberPosition[i] + align + offset);
+		}
+	}
+}
+
 }