X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FConfigMenu.cpp;h=fa51f7732c5d5932e15e11b339b30beb6e1bd590;hb=ec824200aec12d6870b70304bcd2e2aeadba767b;hp=6d6e2d12543e51a8e47f644aa064d85b7da02df7;hpb=2255d436a0c2acc10b015827366a72b2ece86094;p=l2e.git diff --git a/src/menu/ConfigMenu.cpp b/src/menu/ConfigMenu.cpp index 6d6e2d1..fa51f77 100644 --- a/src/menu/ConfigMenu.cpp +++ b/src/menu/ConfigMenu.cpp @@ -8,10 +8,11 @@ #include "../common/GameState.h" #include "../graphics/Font.h" #include "../graphics/Frame.h" +#include "../math/Vector.h" using app::Input; using common::GameState; -using geometry::Vector; +using math::Vector; using graphics::Font; using graphics::Frame; @@ -28,7 +29,7 @@ ConfigMenu::ConfigMenu(PartyMenu *parent) void ConfigMenu::OnEnterState(SDL_Surface *) { - + configMenu.StartAnimation(Ctrl()); } void ConfigMenu::OnExitState(SDL_Surface *) { @@ -98,7 +99,7 @@ void ConfigMenu::HandleEvents(const Input &input) { } } -void ConfigMenu::UpdateWorld(float deltaT) { +void ConfigMenu::UpdateWorld(Uint32 deltaT) { } @@ -115,7 +116,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( @@ -125,7 +126,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);