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 8dab40e9bba9bde45dcf9a154bacf34f6a1454c4..37ccc72246c1c62c84bac7c77e75af59ffe77107 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -123,9 +123,9 @@ void MapState::OnTileLock() {
                if (afterLock) {
                        bool blocked(CheckBlocking());
                        OnMove(!blocked);
-                       afterLock = false;
                        controlled->SetOrientation(Entity::Orientation(nextDirection));
                        if (!blocked) {
+                               afterLock = false;
                                controlled->SetSpeed(walkingSpeed);
                                moveTimer.Clear();
                                if (pushed) {
@@ -265,7 +265,7 @@ bool MapState::OnGridLock() {
                return false;
        } else {
                LockEntities();
-               return CheckMonster() || CheckTrigger();
+               return CheckMonster() || CheckLockTrigger();
        }
 }
 
@@ -322,23 +322,17 @@ bool MapState::CheckMonster() {
        return false;
 }
 
-bool MapState::CheckTrigger() {
+bool MapState::CheckLockTrigger() {
        Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
-       if (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);
-                       return true;
-               }
-       }
-       return false;
+       if (!trigger || trigger->GetType() != Trigger::TYPE_CONTACT) return false;
+       RunTrigger(*trigger);
+       return true;
 }
 
 void MapState::OnMove(bool realMove) {
+       if (CheckMoveTrigger()) {
+               return;
+       }
        // TODO: evaluate monster movements
        if (realMove) {
                UpdateFollower(*controlled);
@@ -347,6 +341,18 @@ void MapState::OnMove(bool realMove) {
        }
 }
 
+bool MapState::CheckMoveTrigger() {
+       Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
+       if (!trigger || int(trigger->GetType()) != nextDirection) return false;
+       RunTrigger(*trigger);
+       return true;
+}
+
+void MapState::RunTrigger(Trigger &trigger) {
+       if (!trigger.HasScript()) return;
+       runner.Run(*this, trigger.GetScript());
+}
+
 void MapState::UpdateFollower(Entity &e) {
        if (!e.Follower()) return;
 
@@ -406,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);
@@ -434,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;
+               }
+       }
+}
+
 }