X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=cf6e78bbf6c9596235b82ecc5d18001881c68bb6;hb=6a3c11d028e0c5f69f910cee37cbf6eb6d5e04d9;hp=987a985cc74083e76a29953a357b490ea12947fe;hpb=9d5e525f2bd9035e9add815e287313d09c1bf0fd;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 987a985..cf6e78b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,15 +89,24 @@ int main(int argc, char **argv) {
 		heroesLayout.AddPosition(Point<Uint8>(160, 152));
 
 		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-		Sprite dummySprite(monsterImg, 64, 64);
+		Sprite monsterSprite(monsterImg, 64, 64);
 		Monster monster;
 		monster.SetName("Lizard");
-		monster.SetSprite(&dummySprite);
+		monster.SetSprite(&monsterSprite);
 		monster.SetLevel(1);
 		monster.SetMaxHealth(8);
 		monster.SetHealth(8);
 		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>(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);
+		SimpleAnimation monsterMeleeAnimation(&monsterMeleeSprite, framerate, 14);
+		monster.SetMeleeAnimation(&monsterMeleeAnimation);
 
 		SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
 		Sprite maximSprite(maximImg, 64, 64);
@@ -254,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);
@@ -346,9 +356,7 @@ int main(int argc, char **argv) {
 		Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32);
 		Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
 		battleRes.weaponTargetCursor = &weaponTargetCursor;
-		// TODO: add image for magic targeting cursor
 		battleRes.magicTargetCursor = &magicTargetCursor;
-		// TODO: add image for item targeting cursor
 		battleRes.itemTargetCursor = &itemTargetCursor;
 
 		Spell resetSpell;