From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 15 Aug 2012 18:33:43 +0000 (+0200)
Subject: added Selan's melee animation
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=64895425dd61660cfb7c4b2a91aecab798d84c47;p=l2e.git

added Selan's melee animation
---

diff --git a/src/main.cpp b/src/main.cpp
index 909cbd4..ab15296 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -151,6 +151,10 @@ int main(int argc, char **argv) {
 		selanSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
 		selanSpellAnimation.AddFrames(2, 3, Vector<int>(), 2);
 		selan.SetSpellAnimation(&selanSpellAnimation);
+		SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png"));
+		Sprite selanMeleeSprite(selanMeleeImg, 96, 96);
+		SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 30, 4);
+		selan.SetMeleeAnimation(&selanMeleeAnimation);
 
 		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
 		Sprite guySprite(guyImg, 64, 64);
diff --git a/test-data/melee-selan.png b/test-data/melee-selan.png
new file mode 100644
index 0000000..bc40d54
Binary files /dev/null and b/test-data/melee-selan.png differ