X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=c34e1144cdc6e4e54de9ca9ec1b6130bb6dafbd6;hb=b9fdb4fd361fbc0c8e2c0df9615e6eed540917a1;hp=09366d4d3ec3b642e1002eb13522fa82bc590553;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 09366d4..c34e114 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -17,9 +17,9 @@
 #include "../../common/Spell.h"
 #include "../../geometry/operators.h"
 #include "../../geometry/Point.h"
-#include "../../graphics/Animation.h"
 #include "../../graphics/Font.h"
 #include "../../graphics/Frame.h"
+#include "../../graphics/SimpleAnimation.h"
 
 #include <cstring>
 
@@ -27,7 +27,7 @@ using app::Application;
 using app::Input;
 using geometry::Point;
 using geometry::Vector;
-using graphics::Animation;
+using graphics::SimpleAnimation;
 
 namespace battle {
 
@@ -80,13 +80,13 @@ void PerformAttacks::HandleEvents(const Input &input) {
 
 				switch (ac.GetType()) {
 					case AttackChoice::SWORD:
-						battle->HeroAnimationAt(cursor) = Animation(
+						battle->HeroAnimationAt(cursor) = SimpleAnimation(
 								battle->HeroAt(cursor).Sprite(),
 								battle->HeroAt(cursor).AttackFrameTime(),
 								battle->HeroAt(cursor).AttackFrames(), 2);
 						break;
 					case AttackChoice::MAGIC:
-						battle->HeroAnimationAt(cursor) = Animation(
+						battle->HeroAnimationAt(cursor) = SimpleAnimation(
 								battle->HeroAt(cursor).Sprite(),
 								battle->HeroAt(cursor).SpellFrameTime(),
 								battle->HeroAt(cursor).SpellFrames(), 3);
@@ -96,12 +96,12 @@ void PerformAttacks::HandleEvents(const Input &input) {
 					case AttackChoice::IKARI:
 						if (ac.GetItem()->HasIkari()) {
 							if (ac.GetItem()->GetIkari()->IsMagical()) {
-								battle->HeroAnimationAt(cursor) = Animation(
+								battle->HeroAnimationAt(cursor) = SimpleAnimation(
 										battle->HeroAt(cursor).Sprite(),
 										battle->HeroAt(cursor).SpellFrameTime(),
 										battle->HeroAt(cursor).SpellFrames(), 3);
 							} else {
-								battle->HeroAnimationAt(cursor) = Animation(
+								battle->HeroAnimationAt(cursor) = SimpleAnimation(
 										battle->HeroAt(cursor).Sprite(),
 										battle->HeroAt(cursor).AttackFrameTime(),
 										battle->HeroAt(cursor).AttackFrames(), 2);