changed battle positions from bottom-center to center

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 49a79b62e7b8d7bb34e166281fa5cac5cee9f8ad..909cbd4be04c6292f990c661fd4d5dd265762c09 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,6 @@
 
 #include "app/Application.h"
 #include "app/Input.h"
-#include "battle/AttackAnimation.h"
 #include "battle/BattleState.h"
 #include "battle/Hero.h"
 #include "battle/Monster.h"
@@ -37,7 +36,6 @@
 
 using app::Application;
 using app::Input;
-using battle::AttackAnimation;
 using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
@@ -76,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);
@@ -122,13 +120,7 @@ int main(int argc, char **argv) {
                SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png"));
                Sprite maximMeleeSprite(maximMeleeImg, 96, 96);
                SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 30, 4);
-               AttackAnimation maximMeleeScript;
-               maximMeleeScript.PlayAttackAnimation();
-               maximMeleeScript.StartTimer(150);
-               maximMeleeScript.WaitForTimer();
-               maximMeleeScript.PlayTargetAnimation(&maximMeleeAnimation);
-               maximMeleeScript.WaitForAnimations();
-               maxim.SetMeleeAnimation(&maximMeleeScript);
+               maxim.SetMeleeAnimation(&maximMeleeAnimation);
 
                SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
                Sprite selanSprite(selanImg, 64, 64);