changed battle positions from bottom-center to center

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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index a4e8158a4339af806392d9e0b7489a9adc3d46b4..1a4f726de656c7a5c561ac01315d7472c898ace9 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);
@@ -284,19 +284,19 @@ void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offse
 
 void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset) {
        for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
-               monsters[i].Sprite()->DrawCenterBottom(screen, monsterPositions[i] + offset);
+               monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
        }
 }
 
 void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
        for (int i(0); i < numHeroes; ++i) {
                if (heroes[i].AttackAnimation() && heroes[i].AttackAnimation()->Running()) {
-                       heroes[i].AttackAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+                       heroes[i].AttackAnimation()->DrawCenter(screen, heroesPositions[i] + offset);
                } else if (heroes[i].SpellAnimation() && heroes[i].SpellAnimation()->Running()) {
-                       heroes[i].SpellAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+                       heroes[i].SpellAnimation()->DrawCenter(screen, heroesPositions[i] + offset);
                } else {
                        int row(heroes[i].Health() > 0 ? 0 : 2);
-                       heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 1, row);
+                       heroes[i].Sprite()->DrawCenter(screen, heroesPositions[i] + offset, 1, row);
                }
        }
 }
@@ -316,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;