X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=7e42e13a1779ef5041d64fbf57ecf4ef410fbda8;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=d50cda65bfa782e1ee4a0a485c29e89676e8ed71;hpb=85d247c6e6b1bb2a6e0b177ef71a4541e69380d1;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index d50cda6..7e42e13 100644
--- 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)
@@ -47,25 +47,25 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::EnterState(Application &c, SDL_Surface *screen) {
+void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
 
-void MapState::ExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void MapState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 }
 
-void MapState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
 	camera.Resize(width, height);
 }
 
@@ -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;
+		}
+	}
+}
+
 }