Merge branch 'master' into menus

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index d442f2289becfefbbf4432ac37e637e292001eb3..7c8b3306e8c29947c9a4868c8de8c2d20c8f408f 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -79,7 +79,7 @@ void BattleState::OnResize(int w, int h) {
 }
 
 
-void BattleState::OnEnterState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnEnterState(SDL_Surface *screen) {
        for (int i(0); i < 4; ++i) {
                heroes[i].Position() = heroesLayout->CalculatePosition(i, background->w, background->h);
                heroes[i].SpellMenu() = *res->spellMenuProperties;
@@ -113,6 +113,7 @@ void BattleState::OnEnterState(Application &ctrl, SDL_Surface *screen) {
 
        itemMenu = *res->itemMenuProperties;
        LoadInventory();
+       ClearAllAttacks();
 }
 
 void BattleState::LoadInventory() {
@@ -127,31 +128,30 @@ void BattleState::LoadInventory() {
                        itemMenu.AddEmptyEntry();
                }
        }
-       ClearAllAttacks();
 }
 
-void BattleState::OnExitState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void BattleState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnResumeState(SDL_Surface *screen) {
        if (ranAway) {
-               ctrl.PopState(); // quit the battle scene
+               Ctrl().PopState(); // quit the battle scene
                return;
        }
        if (Victory()) {
-               ctrl.PopState();
+               Ctrl().PopState();
                return;
        }
        if (Defeat()) {
-               ctrl.PopState();
+               Ctrl().PopState();
                return;
        }
        // TODO: this should not push a state while quitting
        if (AttackSelectionDone()) {
-               ctrl.PushState(new PerformAttacks(this));
+               Ctrl().PushState(new PerformAttacks(this));
        } else {
-               ctrl.PushState(new SelectMoveAction(this));
+               Ctrl().PushState(new SelectMoveAction(this));
        }
 }
 
@@ -169,7 +169,7 @@ bool BattleState::Defeat() const {
        return true;
 }
 
-void BattleState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnPauseState(SDL_Surface *screen) {
 
 }