renamed app::State's Resize -> OnResize

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 06ea7270f545ec25aebb6e4234c2587b011adac6..b84d7248da1a465b7eafa557cc85c0d393b6789f 100644 (file)
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -165,7 +165,7 @@ void Application::HandleEvents() {
                                break;
                        case SDL_VIDEORESIZE:
                                screen.Resize(event.resize.w, event.resize.h);
-                               CurrentState()->Resize(event.resize.w, event.resize.h);
+                               CurrentState()->OnResize(event.resize.w, event.resize.h);
                                break;
                        case SDL_KEYDOWN:
                        case SDL_KEYUP:

diff --git a/src/app/State.h b/src/app/State.h
index 28cb94d5d978179e2828f132aa6819875a5fd241..6783d76052c41f17a2b1d8ea24e9b9ffccf42b2a 100644 (file)
--- a/src/app/State.h
+++ b/src/app/State.h
@@ -39,7 +39,7 @@ public:
        /// NOTE: currently, this is only called for the stack top and not
        ///       propagated on stack changes.
        ///       Will be fixed soom ;).
-       virtual void Resize(int width, int height) = 0;
+       virtual void OnResize(int width, int height) = 0;
 
        /// Handle interactive events such as input and timers.
        virtual void HandleEvents(const Input &) = 0;

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index c2310eaeed3510196575802f8b7c628507340b92..d442f2289becfefbbf4432ac37e637e292001eb3 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -74,7 +74,7 @@ void BattleState::SwapHeroes(int lhs, int rhs) {
 }
 
 
-void BattleState::Resize(int w, int h) {
+void BattleState::OnResize(int w, int h) {
 
 }
 

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 4ac64594ba498d35b3e2dfae0fd4d604176247a0..00cea78781cf14166dc779408c344475b0371cd2 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -61,7 +61,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 2c82c09aa1d6cb02ec2733a043710e03fdd5e32e..50c7b1443ad9b4dd1e3ccafaefac567755df9df3 100644 (file)
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -50,7 +50,7 @@ void PerformAttacks::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void PerformAttacks::Resize(int width, int height) {
+void PerformAttacks::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index 44ea74bf9eb97e9aad025995c318dfb0666e0d1c..fa16b4c37a7a1e1a1427c4eec35ed8fa2388e3f5 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -32,7 +32,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index 56bcbedc7c7db2c7c02dabae00eb2cda0216aec7..dbf38680d55671ab69ba6057e5bc23eaab0e0398 100644 (file)
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -39,7 +39,7 @@ void RunState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void RunState::Resize(int width, int height) {
+void RunState::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index b1c18cb7bca65382ac3c11f95fc5c211e552c381..e2d1b1b31f124cf9f55f0bf57a5faad41520500a 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 351ad1c3584337d85a4d6b4baa3bc20a7a8fc3bb..c41eb67bec8d39e17da1ae3abad743acdcdeb6d7 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -51,7 +51,7 @@ void SelectAttackType::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectAttackType::Resize(int width, int height) {
+void SelectAttackType::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index 6acaaef8e15bc39b75f166257e464bb6569f6323..690427f070371270a0b0ffef0a06a9e229c1244d 100644 (file)
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 898b85c27e8600219abf25966415982c369c7705..1a36e41c86ed9483e54ac4f7ae7646932eae7aea 100644 (file)
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -45,7 +45,7 @@ void SelectIkari::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectIkari::Resize(int width, int height) {
+void SelectIkari::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 9e89912f63274163b1ec7e63a8245f270dabd572..c213b7f2ada60d0e5eab93d42ba6b0b8611f814b 100644 (file)
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -28,7 +28,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 86f11c25bf3e79547671a9cb507ce85c974a2c94..35a0c61ca9262bf2deebb68f6805133d9aa7f04a 100644 (file)
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -44,7 +44,7 @@ void SelectItem::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectItem::Resize(int width, int height) {
+void SelectItem::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index bf29124e55cc0657851c32cd778968656a36e004..5fe98d0ec72996b9f289988a98605776383114cb 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index 351116bf0918e4e7aa434fcdc76accd7b412d941..072b03d229791c55ad9d57d93b736f552b503952 100644 (file)
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -38,7 +38,7 @@ void SelectMoveAction::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectMoveAction::Resize(int width, int height) {
+void SelectMoveAction::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index f302ebf9ac0b5b36a7175a619af07158d0229f4a..2a55a92f7f3e512a4e066e57d23b95423098c3d9 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index cdf9b698fe9405416d803cbe33d25c42609c94d4..6ea4675efcbbe1c381d4c70148ddec5414a630e0 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -45,7 +45,7 @@ void SelectSpell::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index 237e662c99753830db45d9ee396755c07593cfca..823bef2395dab65613391576ed2c2a24f84e1d46 100644 (file)
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SelectTarget.cpp b/src/battle/states/SelectTarget.cpp
index 0b5b01d6b78a3e096eba04df7aa9882af4cc896e..4645f6debd37dfaf50ad2c450c6725800b35c52d 100644 (file)
--- a/src/battle/states/SelectTarget.cpp
+++ b/src/battle/states/SelectTarget.cpp
@@ -36,7 +36,7 @@ void SelectTarget::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SelectTarget::Resize(int width, int height) {
+void SelectTarget::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index 50d1000505d9e8b06b0b54befe75fbee983a5179..2f1f38403d19696d789a7d330e6554a7dc796ff5 100644 (file)
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -28,7 +28,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index 0feb7e9a59ac04a18288e04348cf4e7d730b5b6f..678b5c8bfdf3b53dd1f0e180cb6661db3a74b9ad 100644 (file)
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -36,7 +36,7 @@ void SwapHeroes::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void SwapHeroes::Resize(int width, int height) {
+void SwapHeroes::OnResize(int width, int height) {
 
 }
 

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 1e7602aa0405bf51cad8193e6b40c82e94b32a3c..68e736001db6d85ae6719306ab1b5a7c35c6ff87 100644 (file)
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/graphics/ColorFade.cpp b/src/graphics/ColorFade.cpp
index ac45a9e6fb8dd6ae887c624d2b6f1616d9a62864..b33ee0838540d36e46ea9a119fda3c9a2508b4fa 100644 (file)
--- a/src/graphics/ColorFade.cpp
+++ b/src/graphics/ColorFade.cpp
@@ -56,8 +56,8 @@ void ColorFade::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void ColorFade::Resize(int width, int height) {
-       slave->Resize(width, height);
+void ColorFade::OnResize(int width, int height) {
+       slave->OnResize(width, height);
        UpdateBlinds(width, height);
 }
 

diff --git a/src/graphics/ColorFade.h b/src/graphics/ColorFade.h
index 4ccb02b532d60f9863971f471567ed41f354410a..947675e23ca1b238485f509e41feb20391316df1 100644 (file)
--- a/src/graphics/ColorFade.h
+++ b/src/graphics/ColorFade.h
@@ -32,7 +32,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 8103fb1d513804e4335510f07478f46c7c6c7eb6..7e42e13a1779ef5041d64fbf57ecf4ef410fbda8 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -65,7 +65,7 @@ void MapState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
        camera.Resize(width, height);
 }
 

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 35c6d6494ef6008a2638d67a27fe3f032c8de85d..c5f26e170523cc55f973cb898ea758f50d7eaab7 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -34,7 +34,7 @@ public:
        virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);

diff --git a/src/map/TransitionState.cpp b/src/map/TransitionState.cpp
index 75a4deaa540b86ea3d9727175a12ff04c1eff106..1a2afb50854e6a2d8485fd0b912ba09076aea06c 100644 (file)
--- a/src/map/TransitionState.cpp
+++ b/src/map/TransitionState.cpp
@@ -42,7 +42,7 @@ void TransitionState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void TransitionState::Resize(int width, int height) {
+void TransitionState::OnResize(int width, int height) {
 
 }
 

diff --git a/src/map/TransitionState.h b/src/map/TransitionState.h
index 844665a34c3db2d41acc388751b18a16446c1132..2a99f1adc8beaa82585aa04263a546b5203cca06 100644 (file)
--- a/src/map/TransitionState.h
+++ b/src/map/TransitionState.h
@@ -27,7 +27,7 @@ public:
        virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
        virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-       virtual void Resize(int width, int height);
+       virtual void OnResize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);