X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FConfigMenu.cpp;h=8445e82cce78ec811b6d7797b9b9f98affe4ce30;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=b5a2b7d4e9d73e038303ad473ed507cc3bcc483c;hpb=a115853500fdaf2715ce3dceef568fed3884d163;p=l2e.git diff --git a/src/menu/ConfigMenu.cpp b/src/menu/ConfigMenu.cpp index b5a2b7d..8445e82 100644 --- a/src/menu/ConfigMenu.cpp +++ b/src/menu/ConfigMenu.cpp @@ -1,14 +1,9 @@ -/* - * ConfigMenu.cpp - * - * Created on: Nov 29, 2012 - * Author: holy - */ - #include "ConfigMenu.h" #include "PartyMenu.h" #include "Resources.h" +#include "../app/Application.h" +#include "../app/Input.h" #include "../common/GameConfig.h" #include "../common/GameState.h" #include "../graphics/Font.h" @@ -16,7 +11,7 @@ using app::Input; using common::GameState; -using geometry::Vector; +using math::Vector; using graphics::Font; using graphics::Frame; @@ -103,7 +98,7 @@ void ConfigMenu::HandleEvents(const Input &input) { } } -void ConfigMenu::UpdateWorld(float deltaT) { +void ConfigMenu::UpdateWorld(Uint32 deltaT) { } @@ -120,7 +115,7 @@ void ConfigMenu::Render(SDL_Surface *screen) { RenderMenu(screen, offset + menuOffset); } -void ConfigMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector &offset) const { +void ConfigMenu::RenderHeadline(SDL_Surface *screen, const math::Vector &offset) const { const Font &font(*parent->Res().normalFont); const Frame &frame(*parent->Res().statusFrame); const Vector textOffset( @@ -130,7 +125,7 @@ void ConfigMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector font.DrawString(parent->Res().mainMenuConfigText, screen, offset + textOffset, 6); } -void ConfigMenu::RenderMenu(SDL_Surface *screen, const geometry::Vector &offset) const { +void ConfigMenu::RenderMenu(SDL_Surface *screen, const math::Vector &offset) const { const Resources &res(parent->Res()); const Font &font(*res.normalFont); const Font &inactiveFont(*res.inactiveFont);