X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FCapsuleMenu.cpp;h=e50215ce34979cc628853a9225d55d31c160f637;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=5a800a39294fd7d9a0ae699173c34a977e4a0de1;hpb=6dff93b1a6e9b727dbe26747456f4b23efca86da;p=l2e.git diff --git a/src/menu/CapsuleMenu.cpp b/src/menu/CapsuleMenu.cpp index 5a800a3..e50215c 100644 --- a/src/menu/CapsuleMenu.cpp +++ b/src/menu/CapsuleMenu.cpp @@ -18,7 +18,7 @@ using app::Input; using common::Capsule; using common::Stats; -using geometry::Vector; +using math::Vector; using graphics::Font; using graphics::Frame; @@ -83,7 +83,7 @@ void CapsuleMenu::HandleEvents(const Input &input) { } } -void CapsuleMenu::UpdateWorld(float deltaT) { +void CapsuleMenu::UpdateWorld(Uint32 deltaT) { } @@ -180,7 +180,7 @@ void CapsuleMenu::RenderInfo(SDL_Surface *screen, const Vector &offset) con void CapsuleMenu::RenderWheel(SDL_Surface *screen, const Vector &offset) const { Res().capsuleAlignmentWheel->DrawCenter(screen, offset); - Res().capsuleAlignmentCursor->DrawCenter(screen, offset + Game().state->capsule->AlignmentOffset()); + Res().capsuleAlignmentCursor->DrawCenter(screen, offset + Game().state->GetCapsule().AlignmentOffset()); } void CapsuleMenu::RenderStats(SDL_Surface *screen, const Vector &offset) const { @@ -220,7 +220,7 @@ void CapsuleMenu::RenderStats(SDL_Surface *screen, const Vector &offset) co font.DrawNumberRight(capsule.NextLevel(), screen, lineHead); } -void CapsuleMenu::RenderStatsLine(SDL_Surface *screen, const geometry::Vector &offset, const char *name, int value) const { +void CapsuleMenu::RenderStatsLine(SDL_Surface *screen, const math::Vector &offset, const char *name, int value) const { const Font &font(*Res().statusFont); const Vector numberOffset(4 * font.CharWidth(), 0); @@ -264,11 +264,11 @@ int CapsuleMenu::Height() const { } Capsule &CapsuleMenu::GetCapsule() { - return *Game().state->capsule; + return Game().state->GetCapsule(); } const Capsule &CapsuleMenu::GetCapsule() const { - return *Game().state->capsule; + return Game().state->GetCapsule(); } }