From e79073197647340d84eafc4b750b54e1cb4e3c8f Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Wed, 15 Aug 2012 22:08:58 +0200 Subject: [PATCH] added Guy's and Dekar's melee animations --- src/main.cpp | 8 ++++++++ test-data/melee-dekar.png | Bin 0 -> 630 bytes test-data/melee-guy.png | Bin 0 -> 1622 bytes test-data/melee-maxim.png | Bin 1637 -> 1626 bytes 4 files changed, 8 insertions(+) create mode 100644 test-data/melee-dekar.png create mode 100644 test-data/melee-guy.png 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(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(), 2); dekarSpellAnimation.AddFrames(2, 2, Vector(), 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 index 0000000000000000000000000000000000000000..4653cc2bab5b77c7e2dcade0ca0acd718c44a2a3 GIT binary patch literal 630 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