cached some of the battle coordinates

[l2e.git] / src / battle / states / SelectAttackType.cpp

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 20ab7a4db4f05b90271797217940d0622553d49e..b4f5dcc73f69a071bc4877d682dc27d2c52da2c4 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -22,7 +22,7 @@ using math::Vector;
 namespace battle {
 
 void SelectAttackType::OnEnterState(SDL_Surface *screen) {
-
+       OnResize(screen->w, screen->h);
 }
 
 void SelectAttackType::OnExitState(SDL_Surface *screen) {
@@ -46,7 +46,11 @@ void SelectAttackType::OnPauseState(SDL_Surface *screen) {
 
 
 void SelectAttackType::OnResize(int width, int height) {
-
+       Vector<int> offset(battle->ScreenOffset());
+       Vector<int> position(
+                       (battle->Width() - battle->GetAttackTypeMenu().Width()) / 2,
+                       battle->Height() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
+       menuOffset = offset + position;
 }
 
 
@@ -120,18 +124,14 @@ void SelectAttackType::UpdateWorld(Uint32 deltaT) {
 }
 
 void SelectAttackType::Render(SDL_Surface *screen) {
-       Vector<int> offset(battle->CalculateScreenOffset(screen));
-       battle->RenderBackground(screen, offset);
-       battle->RenderMonsters(screen, offset);
-       battle->RenderHeroTags(screen, offset);
-       RenderMenu(screen, offset);
+       battle->RenderBackground(screen);
+       battle->RenderMonsters(screen);
+       battle->RenderHeroTags(screen);
+       RenderMenu(screen);
 }
 
-void SelectAttackType::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-       Vector<int> position(
-                       (battle->Width() - battle->GetAttackTypeMenu().Width()) / 2,
-                       battle->Height() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
-       battle->GetAttackTypeMenu().Render(screen, position + offset);
+void SelectAttackType::RenderMenu(SDL_Surface *screen) {
+       battle->GetAttackTypeMenu().Render(screen, menuOffset);
 }
 
 }