added directional triggers

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

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index d50cda65bfa782e1ee4a0a485c29e89676e8ed71..a716f950e8f0977ebbf14cf456bf64bbf7997f1d 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -35,8 +35,8 @@ MapState::MapState(GameConfig *g, Map *map)
 , map(map)
 , controlled(0)
 , pushed(0)
-, tempTarget(20, 20)
-, camera(100, 100, &tempTarget)
+, lastLock(-1, -1)
+, camera(100, 100, 0)
 , walkingSpeed(64)
 , nextDirection(-1)
 , afterLock(false)
@@ -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,24 @@ 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) {
+       // 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);
+       }
+}
+
 void MapState::UpdateFollower(Entity &e) {
        if (!e.Follower()) return;