X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=6b025319b42747e00accb8ef41badb87018e0df3;hb=2ad47aa3758fe5d04ba1764f275a0fe30706d200;hp=a716f950e8f0977ebbf14cf456bf64bbf7997f1d;hpb=6e88a625710c7936f87b38ecf6094472f3a49f4f;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index a716f95..6b02531 100644
--- 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) {
@@ -446,4 +440,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;
+		}
+	}
+}
+
 }