switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 604689c998d28dbd258f2c8f4636cfc68d1489b2..4b8c5b8d0e529ab7f18a371312b13af5913a67ba 100644 (file)
--- 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) {
 
 }
 
@@ -93,7 +93,7 @@ void SelectIkari::HandleEvents(const Input &input) {
        }
 }
 
-void SelectIkari::UpdateWorld(float deltaT) {
+void SelectIkari::UpdateWorld(Uint32 deltaT) {
 
 }