X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=aff39b5fee7c6145b17eb51809d7c841803a2c9d;hb=854e5229c3f30bf88aa08d7f0aff56a1411c3367;hp=730c5aa01cee254d90a08f7a7ca46df43dc34bd9;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 730c5aa..aff39b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,8 @@
 #include "common/Item.h"
 #include "common/Spell.h"
 #include "geometry/Point.h"
+#include "geometry/Vector.h"
+#include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
 #include "graphics/Gauge.h"
@@ -42,6 +44,8 @@ using common::Inventory;
 using common::Item;
 using common::Spell;
 using geometry::Point;
+using geometry::Vector;
+using graphics::ComplexAnimation;
 using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
@@ -97,8 +101,19 @@ int main(int argc, char **argv) {
 		maxim.SetMaxMana(20);
 		maxim.SetMana(20);
 		maxim.SetIP(0);
-		maxim.SetAttackFrames(3, 125);
-		maxim.SetSpellFrames(2, 125);
+		ComplexAnimation maximAttackAnimation(&maximSprite, 30);
+		maximAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
+		maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, 0), 2);
+		maximAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
+		maximAttackAnimation.AddFrames(2, 1, Vector<int>(-2, 0), 2);
+		maximAttackAnimation.AddFrame(2, 1, Vector<int>(-8, 0));
+		maximAttackAnimation.AddFrames(2, 2, Vector<int>(-8, 0), 2);
+		maximAttackAnimation.AddFrame(2, 2, Vector<int>(-4, 0));
+		maxim.SetAttackAnimation(&maximAttackAnimation);
+		ComplexAnimation maximSpellAnimation(&maximSprite, 150);
+		maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
+		maximSpellAnimation.AddFrame(3, 1);
+		maxim.SetSpellAnimation(&maximSpellAnimation);
 
 		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
 		Sprite selanSprite(selanImg, 64, 64);
@@ -111,8 +126,24 @@ int main(int argc, char **argv) {
 		selan.SetMaxMana(23);
 		selan.SetMana(23);
 		selan.SetIP(1);
-		selan.SetAttackFrames(3, 125);
-		selan.SetSpellFrames(4, 125);
+		ComplexAnimation selanAttackAnimation(&selanSprite, 30);
+		selanAttackAnimation.AddFrames(1, 0, Vector<int>(4, 0), 2);
+		selanAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
+		selanAttackAnimation.AddFrame(2, 0, Vector<int>(10, 4));
+		selanAttackAnimation.AddFrame(2, 0, Vector<int>(14, 4));
+		selanAttackAnimation.AddFrames(2, 0, Vector<int>(12, 2), 3);
+		selanAttackAnimation.AddFrames(2, 1, Vector<int>(14, 2), 2);
+		selanAttackAnimation.AddFrame(2, 1, Vector<int>(2, 0));
+		selanAttackAnimation.AddFrame(2, 2, Vector<int>(-2, -4));
+		selanAttackAnimation.AddFrame(2, 2, Vector<int>(-8, -8));
+		selanAttackAnimation.AddFrame(2, 2);
+		selan.SetAttackAnimation(&selanAttackAnimation);
+		ComplexAnimation selanSpellAnimation(&selanSprite, 30);
+		selanAttackAnimation.AddFrames(2, 0, Vector<int>(), 3);
+		selanAttackAnimation.AddFrames(2, 1, Vector<int>(), 2);
+		selanAttackAnimation.AddFrames(2, 2, Vector<int>(), 3);
+		selanAttackAnimation.AddFrames(2, 3, Vector<int>(), 2);
+		selan.SetSpellAnimation(&selanSpellAnimation);
 
 		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
 		Sprite guySprite(guyImg, 64, 64);
@@ -125,8 +156,18 @@ int main(int argc, char **argv) {
 		guy.SetMaxMana(0);
 		guy.SetMana(0);
 		guy.SetIP(254);
-		guy.SetAttackFrames(3, 125);
-		guy.SetSpellFrames(0, 125);
+		ComplexAnimation guyAttackAnimation(&guySprite, 30);
+		guyAttackAnimation.AddFrames(1, 0, Vector<int>(-4, 0), 2);
+		guyAttackAnimation.AddFrames(1, 0, Vector<int>(-8, 0), 2);
+		guyAttackAnimation.AddFrames(2, 0, Vector<int>(-8, 0), 2);
+		guyAttackAnimation.AddFrame(2, 0, Vector<int>(-4, 0));
+		guyAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
+		guyAttackAnimation.AddFrame(2, 1);
+		guyAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
+		guyAttackAnimation.AddFrame(2, 1, Vector<int>(10, 0));
+		guyAttackAnimation.AddFrame(2, 2, Vector<int>(10, 0));
+		guyAttackAnimation.AddFrame(2, 2);
+		guy.SetAttackAnimation(&guyAttackAnimation);
 
 		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
 		Sprite dekarSprite(dekarImg, 64, 64);
@@ -139,8 +180,22 @@ int main(int argc, char **argv) {
 		dekar.SetMaxMana(0);
 		dekar.SetMana(0);
 		dekar.SetIP(255);
-		dekar.SetAttackFrames(3, 125);
-		dekar.SetSpellFrames(3, 125);
+		ComplexAnimation dekarAttackAnimation(&dekarSprite, 30);
+		dekarAttackAnimation.AddFrame(1, 0, Vector<int>(4, 0));
+		dekarAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
+		dekarAttackAnimation.AddFrame(2, 0, Vector<int>(12, 4));
+		dekarAttackAnimation.AddFrame(2, 0, Vector<int>(16, 4));
+		dekarAttackAnimation.AddFrames(2, 0, Vector<int>(10, 2), 4);
+		dekarAttackAnimation.AddFrame(2, 1, Vector<int>(6, 2));
+		dekarAttackAnimation.AddFrame(2, 1, Vector<int>());
+		dekarAttackAnimation.AddFrame(2, 2, Vector<int>(-2, 0));
+		dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
+		dekar.SetAttackAnimation(&dekarAttackAnimation);
+		ComplexAnimation dekarSpellAnimation(&dekarSprite, 30);
+		dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
+		dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
+		dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
+		dekar.SetSpellAnimation(&dekarSpellAnimation);
 
 		battle::Resources battleRes;