switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 623181e81265339c855fdf57cc1e1b86c661d923..8c0c4da5687110eb1cf3ae574a2e0bf2ccc5ee64 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -19,28 +19,28 @@
 using app::Application;
 using app::Input;
 using common::Spell;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::OnEnterState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
 
 }
 
-void SelectSpell::OnExitState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnExitState(SDL_Surface *screen) {
 
 }
 
-void SelectSpell::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnResumeState(SDL_Surface *screen) {
        if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
                battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
                battle->ActiveHero().GetAttackChoice().SetSpell(battle->ActiveHero().SpellMenu().Selected());
-               ctrl.PopState();
+               Ctrl().PopState();
        }
 }
 
-void SelectSpell::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -93,7 +93,7 @@ void SelectSpell::HandleEvents(const Input &input) {
        }
 }
 
-void SelectSpell::UpdateWorld(float deltaT) {
+void SelectSpell::UpdateWorld(Uint32 deltaT) {
 
 }