X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=791cc0bb319373ccceaaba6a7ae70b5d4fdda211;hb=ed792d6d00d822384d79d049e644e372f7c3b4cd;hp=350a1f48f8be2813585fef2fbc8233b5f4f06000;hpb=07cdc452aeaad73ca9f8f9a3cf9868d2b6c9d5b3;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 350a1f4..791cc0b 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -9,6 +9,7 @@
 
 #include "Map.h"
 #include "Tile.h"
+#include "Trigger.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 
@@ -28,6 +29,7 @@ MapState::MapState(Map *map)
 , walkingSpeed(64)
 , nextDirection(-1)
 , afterLock(false)
+, skipLock(false)
 , debug(false) {
 
 }
@@ -35,6 +37,7 @@ MapState::MapState(Map *map)
 
 void MapState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
+	LoadMap(map);
 }
 
 void MapState::ExitState(Application &ctrl, SDL_Surface *screen) {
@@ -130,11 +133,14 @@ void MapState::OnTileLock() {
 }
 
 bool MapState::CheckBlocking() const {
-	const Tile &tile(map->TileAt(controlled->Position()));
+	const Tile *tile(map->TileAt(controlled->Position()));
+	if (!tile) {
+		return false;
+	}
 	Vector<int> nextPosition;
 	switch (nextDirection) {
 		case Entity::ORIENTATION_NORTH:
-			if (tile.BlocksNorth()) {
+			if (tile->BlocksNorth()) {
 				return true;
 			} else {
 				nextPosition = Vector<int>(
@@ -143,7 +149,7 @@ bool MapState::CheckBlocking() const {
 			}
 			break;
 		case Entity::ORIENTATION_EAST:
-			if (tile.BlocksEast()) {
+			if (tile->BlocksEast()) {
 				return true;
 			} else {
 				nextPosition = Vector<int>(
@@ -152,7 +158,7 @@ bool MapState::CheckBlocking() const {
 			}
 			break;
 		case Entity::ORIENTATION_SOUTH:
-			if (tile.BlocksSouth()) {
+			if (tile->BlocksSouth()) {
 				return true;
 			} else {
 				nextPosition = Vector<int>(
@@ -161,7 +167,7 @@ bool MapState::CheckBlocking() const {
 			}
 			break;
 		case Entity::ORIENTATION_WEST:
-			if (tile.BlocksWest()) {
+			if (tile->BlocksWest()) {
 				return true;
 			} else {
 				nextPosition = Vector<int>(
@@ -183,9 +189,13 @@ bool MapState::CheckBlocking() const {
 }
 
 void MapState::OnGridLock() {
-	LockEntities();
-	CheckMonster();
-	CheckTrigger();
+	if (skipLock) {
+		skipLock = false;
+	} else {
+		LockEntities();
+		CheckMonster();
+		CheckTrigger();
+	}
 }
 
 void MapState::LockEntities() {
@@ -223,7 +233,10 @@ void MapState::CheckMonster() {
 void MapState::CheckTrigger() {
 	Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
 	if (trigger) {
-		// TODO: run trigger
+		// TODO: run trigger script
+		if (trigger->map) {
+			Transition(trigger->map, trigger->target);
+		}
 	}
 
 }
@@ -277,6 +290,30 @@ void MapState::StopFollowers(Entity &e) {
 }
 
 
+void MapState::Transition(Map *newMap, const Vector<int> &coordinates) {
+	UnloadMap();
+	Vector<int> position(coordinates * map->Tileset()->Size());
+	for (Entity *e(controlled); e; e = e->Follower()) {
+		e->Position() = position;
+		e->SetOrientation(controlled->GetOrientation());
+	}
+	LoadMap(newMap);
+	skipLock = true;
+}
+
+void MapState::UnloadMap() {
+	entities.clear();
+}
+
+void MapState::LoadMap(Map *m) {
+	map = m;
+	entities.insert(entities.end(), m->EntitiesBegin(), m->EntitiesEnd());
+	for (Entity *e(controlled); e; e = e->Follower()) {
+		entities.push_back(e);
+	}
+}
+
+
 void MapState::Render(SDL_Surface *screen) {
 	SDL_FillRect(screen, 0, SDL_MapRGB(screen->format, 0, 0, 0));