X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=49f0a1f2f5e363eb3fef8f2a13848bf4854219c0;hb=e79073197647340d84eafc4b750b54e1cb4e3c8f;hp=ab15296374eb5172b93574599364166173e85030;hpb=64895425dd61660cfb7c4b2a91aecab798d84c47;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index ab15296..49f0a1f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -179,6 +179,10 @@ int main(int argc, char **argv) {
 		guyAttackAnimation.AddFrame(2, 2, Vector<int>(10, 0));
 		guyAttackAnimation.AddFrame(2, 2);
 		guy.SetAttackAnimation(&guyAttackAnimation);
+		SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png"));
+		Sprite guyMeleeSprite(guyMeleeImg, 96, 96);
+		SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 30, 4);
+		guy.SetMeleeAnimation(&guyMeleeAnimation);
 
 		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
 		Sprite dekarSprite(dekarImg, 64, 64);
@@ -207,6 +211,10 @@ int main(int argc, char **argv) {
 		dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
 		dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
 		dekar.SetSpellAnimation(&dekarSpellAnimation);
+		SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png"));
+		Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96);
+		SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 30, 4);
+		dekar.SetMeleeAnimation(&dekarMeleeAnimation);
 
 		battle::Resources battleRes;