fixed flags in makefiles

[l2e.git] / src / map / MapState.cpp

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 8103fb1d513804e4335510f07478f46c7c6c7eb6..5ec95071963cbfccac3f3920b3ffc0c1ca56343d 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -31,7 +31,6 @@ namespace map {
 
 MapState::MapState(GameConfig *g, Map *map)
 : game(g)
-, ctrl(0)
 , map(map)
 , controlled(0)
 , pushed(0)
@@ -47,25 +46,24 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+void MapState::OnEnterState(SDL_Surface *screen) {
        camera.Resize(screen->w, screen->h);
        LoadMap(map);
 }
 
-void MapState::OnExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void MapState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(SDL_Surface *screen) {
        camera.Resize(screen->w, screen->h);
 }
 
-void MapState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
        camera.Resize(width, height);
 }
 
@@ -307,9 +305,9 @@ bool MapState::CheckMonster() {
                                ColorFade *fadeOut(new ColorFade(this, 0, 500));
                                fadeOut->SetLeadOutTime(500);
 
-                               ctrl->PushState(fadeIn);
-                               ctrl->PushState(battleState);
-                               ctrl->PushState(fadeOut);
+                               Ctrl().PushState(fadeIn);
+                               Ctrl().PushState(battleState);
+                               Ctrl().PushState(fadeOut);
                                // TODO: move entity erase to happen after the transition or battle
                                entities.erase(e);
                                return true;
@@ -443,13 +441,13 @@ bool MapState::ZCompare(const Entity *lhs, const Entity *rhs) {
 
 
 void MapState::HandleSyscall(common::ScriptRunner &r) {
-       switch (r.Integer0()) {
+       switch (r.IntegerRegister(0)) {
                case TRANSITION: {
-                       ctrl->PushState(new ColorFade(this, 0, 500, true));
-                       ctrl->PushState(new TransitionState(this, reinterpret_cast<Map *>(r.Address0()), r.Vector0()));
+                       Ctrl().PushState(new ColorFade(this, 0, 500, true));
+                       Ctrl().PushState(new TransitionState(this, reinterpret_cast<Map *>(r.AddressRegister(0)), r.VectorRegister(0)));
                        ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
                        fadeOut->SetLeadOutTime(500);
-                       ctrl->PushState(fadeOut);
+                       Ctrl().PushState(fadeOut);
                        break;
                }
        }