added Guy's and Dekar's melee animations

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;
 

diff --git a/test-data/melee-dekar.png b/test-data/melee-dekar.png
new file mode 100644 (file)
index 0000000..4653cc2
Binary files /dev/null and b/test-data/melee-dekar.png differ

diff --git a/test-data/melee-guy.png b/test-data/melee-guy.png
new file mode 100644 (file)
index 0000000..ff22f24
Binary files /dev/null and b/test-data/melee-guy.png differ

diff --git a/test-data/melee-maxim.png b/test-data/melee-maxim.png
index 3e296af1aec64f32ff2519d17be073985af85493..bd6f70b1392e1867beaaaec05b409e111382ee6e 100644 (file)
Binary files a/test-data/melee-maxim.png and b/test-data/melee-maxim.png differ