X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=db221b43324293f29d1fe3e8df0303c2878f6945;hb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;hp=a4e8158a4339af806392d9e0b7489a9adc3d46b4;hpb=85ac93ffe31bfeee54aa6167111f1c15f14bc405;p=l2e.git diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index a4e8158..db221b4 100644 --- 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(xOffset, BackgroundHeight() - 2 * tagHeight); - heroTagPositions[1] = Point(xOffset + tagWidth, BackgroundHeight() - 2 * tagHeight); - heroTagPositions[2] = Point(xOffset, BackgroundHeight() - tagHeight); - heroTagPositions[3] = Point(xOffset + tagWidth, BackgroundHeight() - tagHeight); + int xOffset((Width() - 2 * tagWidth) / 2); + heroTagPositions[0] = Point(xOffset, Height() - 2 * tagHeight); + heroTagPositions[1] = Point(xOffset + tagWidth, Height() - 2 * tagHeight); + heroTagPositions[2] = Point(xOffset, Height() - tagHeight); + heroTagPositions[3] = Point(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(xOffset, yOffset); smallHeroTagPositions[1] = Point(xOffset + 2 * tagWidth, yOffset); smallHeroTagPositions[2] = Point(xOffset + tagWidth, yOffset); @@ -316,8 +316,8 @@ void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector &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;