X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=4bfea03d749142430489cdbc456d1279d147d03d;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=604689c998d28dbd258f2c8f4636cfc68d1489b2;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp index 604689c..4bfea03 100644 --- a/src/battle/states/SelectIkari.cpp +++ b/src/battle/states/SelectIkari.cpp @@ -19,28 +19,28 @@ using app::Application; using app::Input; using common::Ikari; -using geometry::Vector; +using math::Vector; using graphics::Frame; namespace battle { -void SelectIkari::OnEnterState(Application &c, SDL_Surface *screen) { +void SelectIkari::OnEnterState(SDL_Surface *screen) { } -void SelectIkari::OnExitState(Application &c, SDL_Surface *screen) { +void SelectIkari::OnExitState(SDL_Surface *screen) { } -void SelectIkari::OnResumeState(Application &ctrl, SDL_Surface *screen) { +void SelectIkari::OnResumeState(SDL_Surface *screen) { if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) { battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::IKARI); battle->ActiveHero().GetAttackChoice().SetItem(battle->ActiveHero().IkariMenu().Selected()); - ctrl.PopState(); + Ctrl().PopState(); } } -void SelectIkari::OnPauseState(Application &ctrl, SDL_Surface *screen) { +void SelectIkari::OnPauseState(SDL_Surface *screen) { }