X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8325163ef61c435ec662e2d0e0c8f96c74cbe018;hb=9a273798937710928304fdcc5e33a78c6f8b48be;hp=f7707ef1cc0570053097d7e18a8271e23c921dba;hpb=7263bddbde91d555decd58f043f6b43f54ba2b00;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index f7707ef..8325163 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -103,6 +103,10 @@ int main(int argc, char **argv) {
 		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;