renamed state callbacks

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

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index 7eb8fbeb1a8d98b860e692c12edaad6fc7d53cdc..351116bf0918e4e7aa434fcdc76accd7b412d941 100644 (file)
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -14,28 +14,26 @@
 #include "../MoveMenu.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
 
 using app::Application;
 using app::Input;
-using geometry::Point;
 using geometry::Vector;
 
 namespace battle {
 
-void SelectMoveAction::EnterState(Application &c, SDL_Surface *screen) {
+void SelectMoveAction::OnEnterState(Application &c, SDL_Surface *screen) {
        ctrl = &c;
 }
 
-void SelectMoveAction::ExitState(Application &c, SDL_Surface *screen) {
+void SelectMoveAction::OnExitState(Application &c, SDL_Surface *screen) {
        ctrl = 0;
 }
 
-void SelectMoveAction::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void SelectMoveAction::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
@@ -83,7 +81,7 @@ void SelectMoveAction::Render(SDL_Surface *screen) {
 }
 
 void SelectMoveAction::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-       Point<int> position(
+       Vector<int> position(
                        (battle->Width() - battle->GetMoveMenu().Width()) / 2,
                        battle->Height() - battle->GetMoveMenu().Height() - battle->GetMoveMenu().Height() / 2);
        battle->GetMoveMenu().Render(screen, position + offset);