X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=bc6a11894dc0d369cacad07dd6a63c3a80cd2670;hb=69c74684a16695cc068824129ef82ea37f1b4511;hp=fac7cdf855aa42a4c8422f38e5ebd715afd52608;hpb=e1edc92c4fb834c8061118e89c0d7e239742b030;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index fac7cdf..bc6a118 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -1,10 +1,3 @@
-/*
- * PerformAttacks.cpp
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #include "PerformAttacks.h"
 
 #include "../BattleState.h"
@@ -24,7 +17,7 @@
 
 using app::Application;
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 using graphics::AnimationRunner;
 using std::vector;
 
@@ -67,13 +60,20 @@ void PerformAttacks::HandleEvents(const Input &input) {
 
 	battle->CalculateDamage();
 
-	if (battle->CurrentAttack().isMonster) {
+	if (battle->CurrentAttack().IsMonster()) {
 		Monster &monster(battle->MonsterAt(battle->CurrentAttack().index));
 		titleBarText = monster.Name();
 		targetAnimation = AnimationRunner(monster.MeleeAnimation());
 		moveAnimation = AnimationRunner(monster.AttackAnimation());
 		monster.SetAnimation(moveAnimation);
 		AddNumberAnimations(battle->MonsterAt(battle->CurrentAttack().index).GetAttackChoice().Selection());
+	} else if (battle->CurrentAttack().IsCapsule()) {
+		Capsule &capsule(battle->GetCapsule());
+		titleBarText = capsule.Name();
+		targetAnimation = AnimationRunner(capsule.MeleeAnimation());
+		moveAnimation = AnimationRunner(capsule.AttackAnimation());
+		capsule.SetAnimation(moveAnimation);
+		AddNumberAnimations(capsule.GetAttackChoice().Selection());
 	} else {
 		Hero &hero(battle->HeroAt(battle->CurrentAttack().index));
 		const AttackChoice &ac(battle->HeroAt(battle->CurrentAttack().index).GetAttackChoice());
@@ -122,10 +122,12 @@ void PerformAttacks::HandleEvents(const Input &input) {
 	if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(850);
 	if (moveAnimation.Valid()) {
 		moveAnimation.Start(*this);
-		if (battle->CurrentAttack().isMonster) {
+		if (battle->CurrentAttack().IsMonster()) {
 			battle->MonsterAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
-		} else {
+		} else if (battle->CurrentAttack().IsHero()) {
 			battle->HeroAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+		} else {
+			battle->GetCapsule().SetAnimation(moveAnimation);
 		}
 	}
 	if (targetAnimation.Valid()) {
@@ -195,7 +197,7 @@ bool PerformAttacks::HasAnimationsRunning() const {
 void PerformAttacks::ResetAnimation() {
 	if (moveAnimation.Valid()) {
 		moveAnimation.Clear();
-		if (!battle->CurrentAttack().isMonster) {
+		if (!battle->CurrentAttack().IsMonster()) {
 			battle->HeroAt(battle->CurrentAttack().index).GetAnimation().Clear();
 		}
 	}
@@ -208,7 +210,7 @@ void PerformAttacks::ResetAnimation() {
 }
 
 
-void PerformAttacks::UpdateWorld(float deltaT) {
+void PerformAttacks::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -245,7 +247,7 @@ void PerformAttacks::RenderNumbers(SDL_Surface *screen, const Vector<int> &offse
 	}
 }
 
-void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
 	const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
 	if (ts.TargetsHeroes()) {