added AttackAnimation

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 03cbb213623b26bf9cd0383dcfd2a26f7c95b9ad..db221b43324293f29d1fe3e8df0303c2878f6945 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -83,16 +83,16 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 
        int tagHeight(attackTypeMenu.Height());
        int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
-       int xOffset((BackgroundWidth() - 2 * tagWidth) / 2);
-       heroTagPositions[0] = Point<int>(xOffset, BackgroundHeight() - 2 * tagHeight);
-       heroTagPositions[1] = Point<int>(xOffset + tagWidth, BackgroundHeight() - 2 * tagHeight);
-       heroTagPositions[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight);
-       heroTagPositions[3] = Point<int>(xOffset + tagWidth, BackgroundHeight() - tagHeight);
+       int xOffset((Width() - 2 * tagWidth) / 2);
+       heroTagPositions[0] = Point<int>(xOffset, Height() - 2 * tagHeight);
+       heroTagPositions[1] = Point<int>(xOffset + tagWidth, Height() - 2 * tagHeight);
+       heroTagPositions[2] = Point<int>(xOffset, Height() - tagHeight);
+       heroTagPositions[3] = Point<int>(xOffset + tagWidth, Height() - tagHeight);
 
        tagHeight = res->normalFont->CharHeight() * 4 + res->smallHeroTagFrame->BorderHeight() * 2;
        tagWidth = res->normalFont->CharWidth() * 6 + res->smallHeroTagFrame->BorderWidth() * 2;
-       xOffset = (BackgroundWidth() - 4 * tagWidth) / 2;
-       int yOffset(BackgroundHeight() - tagHeight);
+       xOffset = (Width() - 4 * tagWidth) / 2;
+       int yOffset(Height() - tagHeight);
        smallHeroTagPositions[0] = Point<int>(xOffset, yOffset);
        smallHeroTagPositions[1] = Point<int>(xOffset + 2 * tagWidth, yOffset);
        smallHeroTagPositions[2] = Point<int>(xOffset + tagWidth, yOffset);
@@ -233,6 +233,30 @@ void BattleState::ClearAllAttacks() {
 }
 
 
+class OrderCompare {
+       public:
+               OrderCompare(BattleState *battle) : battle(battle) { }
+               bool operator ()(const BattleState::Order &lhs, const BattleState::Order &rhs) {
+                       int lagl(lhs.isMonster ? battle->MonsterAt(lhs.index).Agility() : battle->HeroAt(lhs.index).Agility());
+                       int ragl(rhs.isMonster ? battle->MonsterAt(rhs.index).Agility() : battle->HeroAt(rhs.index).Agility());
+                       return lagl > ragl;
+               }
+       private:
+               BattleState *battle;
+};
+
+void BattleState::WriteOrder(std::vector<Order> &order) {
+       order.reserve(monsters.size() + NumHeroes());
+       for (int i(0); i < numHeroes; ++i) {
+               order.push_back(Order(i, false));
+       }
+       for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
+               order.push_back(Order(i, true));
+       }
+       std::sort(order.begin(), order.end(), OrderCompare(this));
+}
+
+
 void BattleState::HandleEvents(const Input &input) {
 
 }
@@ -292,8 +316,8 @@ void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector<int> &of
 
        SDL_Rect rect;
        rect.x = offset.X();
-       rect.y = offset.Y() + BackgroundHeight() - tagHeight;
-       rect.w = BackgroundWidth();
+       rect.y = offset.Y() + Height() - tagHeight;
+       rect.w = Width();
        rect.h = tagHeight;
        SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, 0, 0, 0));
        rect.y += res->normalFont->CharHeight() / 8;