X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=cf6e78bbf6c9596235b82ecc5d18001881c68bb6;hb=6a3c11d028e0c5f69f910cee37cbf6eb6d5e04d9;hp=8325163ef61c435ec662e2d0e0c8f96c74cbe018;hpb=1c5b28e8559e8383958307534e262a9b29f50fdf;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 8325163..cf6e78b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,9 +99,9 @@ int main(int argc, char **argv) {
 		monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6));
 		monster.SetReward(3, 5);
 		ComplexAnimation monsterAttackAnimation(&monsterSprite, 4 * framerate);
-		monsterAttackAnimation.AddFrame(0, 1, Vector<int>(16, 0));
-		monsterAttackAnimation.AddFrame(0, 0, Vector<int>(16, 0));
-		monsterAttackAnimation.AddFrame(0, 1, Vector<int>(16, 0));
+		monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
+		monsterAttackAnimation.AddFrame(0, 0, Vector<int>(0, 16));
+		monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
 		monster.SetAttackAnimation(&monsterAttackAnimation);
 		SDL_Surface *monsterMeleeImg(IMG_Load("test-data/attack-monster.png"));
 		Sprite monsterMeleeSprite(monsterMeleeImg, 96, 64);
@@ -263,29 +263,30 @@ int main(int argc, char **argv) {
 		Font largeFont(&largeFontSprite, 0, -2);
 		battleRes.titleFont = &largeFont;
 
-		battleRes.numberAnimationPrototype = ComplexAnimation(0, framerate);
-		battleRes.numberAnimationPrototype.AddFrame(0, 0);
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0);
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0);
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-		battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
-		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
+		ComplexAnimation numberAnimationPrototype(0, framerate);
+		numberAnimationPrototype.AddFrame(0, 0);
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+		numberAnimationPrototype.AddFrame(0, 0);
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		numberAnimationPrototype.AddFrame(0, 0);
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+		numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
+		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
+		battleRes.numberAnimationPrototype = &numberAnimationPrototype;
 
 		SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
 		Sprite bigNumbersSprite(bigNumbersImg, 16, 32);