X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=ce14c2905982e04efcdce3c9edee11534b4a0931;hb=389d2fcb1e9ca1023cda11da80f00272ab20903a;hp=791cc0bb319373ccceaaba6a7ae70b5d4fdda211;hpb=ed792d6d00d822384d79d049e644e372f7c3b4cd;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 791cc0b..ce14c29 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -9,20 +9,24 @@
 
 #include "Map.h"
 #include "Tile.h"
+#include "TransitionState.h"
 #include "Trigger.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
+#include "../graphics/ColorFade.h"
 
 #include <algorithm>
 
 using app::Application;
 using app::Input;
 using geometry::Vector;
+using graphics::ColorFade;
 
 namespace map {
 
 MapState::MapState(Map *map)
-: map(map)
+: ctrl(0)
+, map(map)
 , controlled(0)
 , tempTarget(20, 20)
 , camera(100, 100, &tempTarget)
@@ -35,7 +39,8 @@ MapState::MapState(Map *map)
 }
 
 
-void MapState::EnterState(Application &ctrl, SDL_Surface *screen) {
+void MapState::EnterState(Application &c, SDL_Surface *screen) {
+	ctrl = &c;
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
@@ -235,7 +240,11 @@ void MapState::CheckTrigger() {
 	if (trigger) {
 		// TODO: run trigger script
 		if (trigger->map) {
-			Transition(trigger->map, trigger->target);
+			ctrl->PushState(new ColorFade(this, 0, 500, true));
+			ctrl->PushState(new TransitionState(this, trigger->map, trigger->target));
+			ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
+			fadeOut->SetLeadOutTime(500);
+			ctrl->PushState(fadeOut);
 		}
 	}