From: Daniel Karbach Date: Wed, 15 Aug 2012 20:08:58 +0000 (+0200) Subject: added Guy's and Dekar's melee animations X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=e79073197647340d84eafc4b750b54e1cb4e3c8f;p=l2e.git added Guy's and Dekar's melee animations --- 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 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 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 3e296af..bd6f70b 100644 Binary files a/test-data/melee-maxim.png and b/test-data/melee-maxim.png differ