renamed app::State's Resize -> OnResize

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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index d9586636d9667ee2d97756e83c28fcc3913bc77a..d442f2289becfefbbf4432ac37e637e292001eb3 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -12,6 +12,7 @@
 #include "states/PerformAttacks.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
+#include "../common/GameState.h"
 #include "../common/Ikari.h"
 #include "../common/Inventory.h"
 #include "../common/Item.h"
@@ -29,6 +30,7 @@ using app::Input;
 using common::Inventory;
 using common::Item;
 using common::Spell;
+using common::Stats;
 using geometry::Vector;
 using graphics::Menu;
 
@@ -72,12 +74,12 @@ void BattleState::SwapHeroes(int lhs, int rhs) {
 }
 
 
-void BattleState::Resize(int w, int h) {
+void BattleState::OnResize(int w, int h) {
 
 }
 
 
-void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnEnterState(Application &ctrl, 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;
@@ -114,7 +116,7 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::LoadInventory() {
-       const Inventory &inv(*res->inventory);
+       const Inventory &inv(game->state->inventory);
        itemMenu.Clear();
        itemMenu.Reserve(inv.MaxItems());
        for (int i(0); i < inv.MaxItems(); ++i) {
@@ -128,11 +130,11 @@ void BattleState::LoadInventory() {
        ClearAllAttacks();
 }
 
-void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnExitState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
        if (ranAway) {
                ctrl.PopState(); // quit the battle scene
                return;
@@ -167,7 +169,7 @@ bool BattleState::Defeat() const {
        return true;
 }
 
-void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void BattleState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }