added menu to status screen

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

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 50c7b1443ad9b4dd1e3ccafaefac567755df9df3..665756fcf38d8639cbe2fcbf8216ab540f0fca95 100644 (file)
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -29,23 +29,21 @@ using std::vector;
 
 namespace battle {
 
-void PerformAttacks::OnEnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+void PerformAttacks::OnEnterState(SDL_Surface *screen) {
        battle->CalculateAttackOrder();
        numberAnimation.reserve(battle->MaxMonsters() > battle->NumHeroes() + 1 ? battle->MaxMonsters() : battle->NumHeroes() + 1);
        numberPosition.reserve(numberAnimation.size());
 }
 
-void PerformAttacks::OnExitState(Application &c, SDL_Surface *screen) {
+void PerformAttacks::OnExitState(SDL_Surface *screen) {
        battle->ClearAllAttacks();
-       ctrl = 0;
 }
 
-void PerformAttacks::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void PerformAttacks::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void PerformAttacks::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void PerformAttacks::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -62,7 +60,7 @@ void PerformAttacks::HandleEvents(const Input &input) {
        battle->ApplyDamage();
        battle->NextAttack();
        if (battle->AttacksFinished()) {
-               ctrl->PopState();
+               Ctrl().PopState();
                return;
        }