fixed formatting of battle::RunState

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

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index 7e7dfc49b5ceb04262287a8c04886d39cd9027ed..f49f36fa0336b9a8e421884085135860f2b56b27 100644 (file)
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -11,12 +11,15 @@
 
 using app::Application;
 using app::Input;
+using graphics::Font;
+using graphics::Frame;
 using math::Vector;
+using std::strlen;
 
 namespace battle {
 
 void RunState::OnEnterState(SDL_Surface *screen) {
-
+       OnResize(screen->w, screen->h);
 }
 
 void RunState::OnExitState(SDL_Surface *screen) {
@@ -33,7 +36,18 @@ void RunState::OnPauseState(SDL_Surface *screen) {
 
 
 void RunState::OnResize(int width, int height) {
-
+       const Resources &res = battle->Res();
+       const Frame &frame = *res.titleFrame;
+       const Font &font = *res.titleFont;
+
+       framePosition = battle->ScreenOffset();
+       frameSize = Vector<int> (
+                       battle->Width(),
+                       frame.BorderHeight() * 2 + font.CharHeight());
+
+       textPosition = Vector<int>(
+                       (battle->Width() - strlen(res.escapeText) * font.CharWidth()) / 2,
+                       frame.BorderHeight());
 }
 
 
@@ -50,22 +64,17 @@ void RunState::UpdateWorld(Uint32 deltaT) {
 }
 
 void RunState::Render(SDL_Surface *screen) {
-       Vector<int> offset(battle->CalculateScreenOffset(screen));
-       battle->RenderBackground(screen, offset);
-       battle->RenderMonsters(screen, offset);
-       battle->RenderHeroes(screen, offset);
-       battle->RenderSmallHeroTags(screen, offset);
-       RenderTitleBar(screen, offset);
+       battle->RenderBackground(screen);
+       battle->RenderMonsters(screen);
+       battle->RenderHeroes(screen);
+       battle->RenderSmallHeroTags(screen);
+       RenderTitleBar(screen);
 }
 
-void RunState::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offset) {
-       int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-       battle->Res().titleFrame->Draw(screen, offset, battle->Width(), height);
-
-       Vector<int> textPosition(
-                       (battle->Width() - (std::strlen(battle->Res().escapeText) * battle->Res().titleFont->CharWidth())) / 2,
-                       battle->Res().titleFrame->BorderHeight());
-       battle->Res().titleFont->DrawString(battle->Res().escapeText, screen, textPosition + offset);
+void RunState::RenderTitleBar(SDL_Surface *screen) {
+       const Resources &res = battle->Res();
+       res.titleFrame->Draw(screen, framePosition, frameSize.X(), frameSize.Y());
+       res.titleFont->DrawString(res.escapeText, screen, textPosition);
 }
 
 }