added map transition state

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

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 791cc0bb319373ccceaaba6a7ae70b5d4fdda211..64c254786559bb2fce4958005c1dde5de85d8bd9 100644 (file)
--- 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,9 @@ 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));
+                       ctrl->PushState(new ColorFade(this, 0, 500, false));
                }
        }