added Guy's and Dekar's melee animations

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ab15296374eb5172b93574599364166173e85030..49f0a1f2f5e363eb3fef8f2a13848bf4854219c0 100644 (file)
--- 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;