moved map data to maps.l2s

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

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index a716f950e8f0977ebbf14cf456bf64bbf7997f1d..37ccc72246c1c62c84bac7c77e75af59ffe77107 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -349,14 +349,8 @@ bool MapState::CheckMoveTrigger() {
 }
 
 void MapState::RunTrigger(Trigger &trigger) {
-       // TODO: run trigger script
-       if (trigger.map) {
-               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);
-       }
+       if (!trigger.HasScript()) return;
+       runner.Run(*this, trigger.GetScript());
 }
 
 void MapState::UpdateFollower(Entity &e) {
@@ -418,6 +412,7 @@ void MapState::LoadMap(Map *m) {
        map = m;
        for (Entity *e(m->EntitiesBegin()), *end(m->EntitiesEnd()); e != end; ++e) {
                entities.push_back(e);
+               e->ResetPosition(map->Tileset()->Size());
        }
        for (Entity *e(controlled); e; e = e->Follower()) {
                entities.push_back(e);
@@ -446,4 +441,18 @@ bool MapState::ZCompare(const Entity *lhs, const Entity *rhs) {
        return lhs->Position().Y() < rhs->Position().Y();
 }
 
+
+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()));
+                       ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
+                       fadeOut->SetLeadOutTime(500);
+                       ctrl->PushState(fadeOut);
+                       break;
+               }
+       }
+}
+
 }