X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=8e70acd19dbbccf0adf08601790a693162962db9;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=8103fb1d513804e4335510f07478f46c7c6c7eb6;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 8103fb1..8e70acd 100644
--- 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)
@@ -48,7 +47,6 @@ MapState::MapState(GameConfig *g, Map *map)
 
 
 void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
@@ -65,7 +63,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);
 }
 
@@ -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;
@@ -445,11 +443,11 @@ bool MapState::ZCompare(const Entity *lhs, const Entity *rhs) {
 void MapState::HandleSyscall(common::ScriptRunner &r) {
 	switch (r.Integer0()) {
 		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.Address0()), r.Vector0()));
 			ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
 			fadeOut->SetLeadOutTime(500);
-			ctrl->PushState(fadeOut);
+			Ctrl().PushState(fadeOut);
 			break;
 		}
 	}