X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8325163ef61c435ec662e2d0e0c8f96c74cbe018;hb=fa2eb577b1b5356b8f4b1c23b52f673900ae6b71;hp=1781e5fdc9b1b60b7e68b5bbe5bb749670a43fed;hpb=c6156f6b3dc88a97a78694a2652dfbc874fcc8e4;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 1781e5f..8325163 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -98,11 +98,15 @@ int main(int argc, char **argv) {
 		monster.SetHealth(8);
 		monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6));
 		monster.SetReward(3, 5);
-		ComplexAnimation monsterAttackAnimation(&monsterSprite, 120);
+		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));
 		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);
@@ -351,9 +355,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;