added sword attack animation

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index c4dabad0bf0c44dc45fc9d8a08ef25fe056beb71..49ef3366c581560750aa2155999d60fe300fcd17 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,15 +74,15 @@ int main(int argc, char **argv) {
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
                PartyLayout monstersLayout;
-               monstersLayout.AddPosition(Point<Uint8>(88, 104));
-               monstersLayout.AddPosition(Point<Uint8>(128, 104));
-               monstersLayout.AddPosition(Point<Uint8>(168, 104));
-               monstersLayout.AddPosition(Point<Uint8>(208, 104));
+               monstersLayout.AddPosition(Point<Uint8>(88, 88));
+               monstersLayout.AddPosition(Point<Uint8>(128, 88));
+               monstersLayout.AddPosition(Point<Uint8>(168, 88));
+               monstersLayout.AddPosition(Point<Uint8>(208, 88));
                PartyLayout heroesLayout;
-               heroesLayout.AddPosition(Point<Uint8>(48, 152));
-               heroesLayout.AddPosition(Point<Uint8>(128, 152));
-               heroesLayout.AddPosition(Point<Uint8>(80, 168));
-               heroesLayout.AddPosition(Point<Uint8>(160, 168));
+               heroesLayout.AddPosition(Point<Uint8>(48, 136));
+               heroesLayout.AddPosition(Point<Uint8>(128, 136));
+               heroesLayout.AddPosition(Point<Uint8>(80, 152));
+               heroesLayout.AddPosition(Point<Uint8>(160, 152));
 
                SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
                Sprite dummySprite(monsterImg, 64, 64);
@@ -119,7 +119,7 @@ int main(int argc, char **argv) {
                maxim.SetSpellAnimation(&maximSpellAnimation);
                SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png"));
                Sprite maximMeleeSprite(maximMeleeImg, 96, 96);
-               SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 30, 4);
+               SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 60, 4);
                maxim.SetMeleeAnimation(&maximMeleeAnimation);
 
                SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
@@ -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, 60, 4);
+               selan.SetMeleeAnimation(&selanMeleeAnimation);
 
                SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
                Sprite guySprite(guyImg, 64, 64);
@@ -175,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, 60, 4);
+               guy.SetMeleeAnimation(&guyMeleeAnimation);
 
                SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
                Sprite dekarSprite(dekarImg, 64, 64);
@@ -203,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, 60, 4);
+               dekar.SetMeleeAnimation(&dekarMeleeAnimation);
 
                battle::Resources battleRes;
 
@@ -440,6 +452,10 @@ int main(int argc, char **argv) {
                battleRes.itemMenuHeadline = "Please choose an item.";
                battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
 
+               SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
+               Sprite swordAttackSprite(swordAttackImg, 96, 96);
+               SimpleAnimation swordAttackAnimation(&swordAttackSprite, 60, 4);
+
                Item zircoSword;
                zircoSword.SetName("Zirco sword");
                zircoSword.SetMenuIcon(&swordIcon);
@@ -449,7 +465,8 @@ int main(int argc, char **argv) {
                firestorm.GetTargetingMode().TargetAllEnemies();
                firestorm.SetPhysical();
                zircoSword.SetIkari(&firestorm);
-//             maxim.SetWeapon(&zircoSword);
+               zircoSword.SetAttackAnimation(&swordAttackAnimation);
+               maxim.SetWeapon(&zircoSword);
                Item zirconArmor;
                zirconArmor.SetName("Zircon armor");
                zirconArmor.SetMenuIcon(&armorIcon);
@@ -510,7 +527,7 @@ int main(int argc, char **argv) {
                thundershriek.GetTargetingMode().TargetAllEnemies();
                thundershriek.SetPhysical();
                zircoWhip.SetIkari(&thundershriek);
-               selan.SetWeapon(&zircoWhip);
+//             selan.SetWeapon(&zircoWhip);
                Item zirconPlate;
                zirconPlate.SetName("Zircon plate");
                zirconPlate.SetMenuIcon(&armorIcon);
@@ -571,7 +588,7 @@ int main(int argc, char **argv) {
                torrent.GetTargetingMode().TargetAllEnemies();
                torrent.SetPhysical();
                zircoAx.SetIkari(&torrent);
-               guy.SetWeapon(&zircoAx);
+//             guy.SetWeapon(&zircoAx);
                guy.SetArmor(&zirconArmor);
                Item megaShield;
                megaShield.SetName("Mega shield");
@@ -615,7 +632,7 @@ int main(int argc, char **argv) {
                dragonRush.GetTargetingMode().TargetSingleEnemy();
                dragonRush.SetPhysical();
                lizardBlow.SetIkari(&dragonRush);
-               dekar.SetWeapon(&lizardBlow);
+//             dekar.SetWeapon(&lizardBlow);
                Item holyRobe;
                holyRobe.SetName("Holy robe");
                holyRobe.SetMenuIcon(&armorIcon);