X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=26e20da4948bec91eb126e18fb3e585ae46e923b;hb=e42e6570cb7460a1794fdc674d875a2b798d4f43;hp=b529e216541ac3894ee574bb4460cee4a8e06595;hpb=a1c89e41e38eca790e168b8acd3beee974685fcd;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index b529e21..26e20da 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -70,57 +70,77 @@ void MapState::HandleEvents(const Input &input) {
 }
 
 void MapState::UpdateWorld(float deltaT) {
-	if (controlled && controlled->TileLock(map->Tileset()->Width(), map->Tileset()->Height())) {
-		Vector<int> nowLock(controlled->Position());
-		if (nowLock != lastLock) {
-			OnGridLock();
+	if (controlled && controlled->TileLock(map->Tileset()->Size())) {
+		OnTileLock();
+	}
+	for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+		(*i)->Update(deltaT);
+	}
+}
+
+void MapState::OnTileLock() {
+	if (moveTimer.Running() && !moveTimer.JustHit()) return;
+
+	Vector<int> nowLock(controlled->Position());
+	if (nowLock != lastLock) {
+		OnGridLock();
+		afterLock = true;
+		moveTimer.Clear();
+	} else if (moveTimer.JustHit()) {
+		OnGridLock();
+		afterLock = true;
+	}
+
+	// TODO: halt all activity if lock caused a state/map transition
+
+	if (nextDirection >= 0) {
+		const Tile &tile(map->TileAt(controlled->Position()));
+		bool blocked(false);
+		switch (nextDirection) {
+			case Entity::ORIENTATION_NORTH:
+				blocked = tile.BlocksNorth();
+				break;
+			case Entity::ORIENTATION_EAST:
+				blocked = tile.BlocksEast();
+				break;
+			case Entity::ORIENTATION_SOUTH:
+				blocked = tile.BlocksSouth();
+				break;
+			case Entity::ORIENTATION_WEST:
+				blocked = tile.BlocksWest();
+				break;
 		}
-		if (nextDirection >= 0) {
-			if (afterLock) {
-				// FIXME: this check is unreliable, see #21
-				OnMove();
-				afterLock = false;
-			}
-			controlled->SetOrientation(Entity::Orientation(nextDirection));
-			const Tile &tile(map->TileAt(controlled->Position()));
-			bool blocked(false);
-			switch (controlled->GetOrientation()) {
-				case Entity::ORIENTATION_NORTH:
-					blocked = tile.BlocksNorth();
-					break;
-				case Entity::ORIENTATION_EAST:
-					blocked = tile.BlocksEast();
-					break;
-				case Entity::ORIENTATION_SOUTH:
-					blocked = tile.BlocksSouth();
-					break;
-				case Entity::ORIENTATION_WEST:
-					blocked = tile.BlocksWest();
-					break;
-			}
-			if (!blocked) {
-				controlled->SetSpeed(walkingSpeed);
-			} else {
-				controlled->SetSpeed(0.0f);
-			}
-			if (!controlled->AnimationRunning()) {
-				controlled->StartAnimation(*this);
-			}
+		if (afterLock) {
+			OnMove(!blocked);
+			afterLock = false;
+		}
+		controlled->SetOrientation(Entity::Orientation(nextDirection));
+		if (!blocked) {
+			controlled->SetSpeed(walkingSpeed);
+			moveTimer.Clear();
 		} else {
 			controlled->SetSpeed(0.0f);
-			controlled->StopAnimation();
+			StopFollowers(*controlled);
+			if (!moveTimer.Running()) {
+				int tileSize((controlled->GetOrientation() % 2) ? map->Tileset()->Width() : map->Tileset()->Height());
+				moveTimer = PhysicsTimers().StartInterval(tileSize/walkingSpeed);
+			}
 		}
-		if (nowLock != lastLock) {
-			lastLock = nowLock;
-			afterLock = true;
+		if (!controlled->AnimationRunning()) {
+			controlled->StartAnimation(*this);
 		}
+	} else {
+		controlled->SetSpeed(0.0f);
+		StopFollowers(*controlled);
+		controlled->StopAnimation();
+		moveTimer.Clear();
 	}
-	for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
-		(*i)->Update(deltaT);
-	}
+
+	lastLock = nowLock;
 }
 
 void MapState::OnGridLock() {
+	LockEntities();
 	Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
 	if (trigger) {
 		// TODO: run trigger
@@ -129,17 +149,62 @@ void MapState::OnGridLock() {
 	// TODO: force all entities into their grid positions?
 }
 
-void MapState::OnMove() {
+void MapState::LockEntities() {
+	for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+		if (*i == controlled) {
+			// don't lock player
+			continue;
+		}
+		(*i)->Position().Lock(map->Tileset()->Size());
+	}
+}
+
+void MapState::OnMove(bool realMove) {
 	// TODO: evaluate monster movements
-	UpdateFollower(controlled);
+	if (realMove) {
+		UpdateFollower(*controlled);
+	} else {
+		StopFollowers(*controlled);
+	}
 }
 
-void MapState::UpdateFollower(Entity *e) {
-	if (!e->Follower()) return;
-	UpdateFollower(e->Follower());
+void MapState::UpdateFollower(Entity &e) {
+	if (!e.Follower()) return;
+
+	Entity &f(*e.Follower());
+	UpdateFollower(f);
+
+	Vector<int> coords(map->TileCoordinates(e.Position()));
+	Vector<int> fCoords(map->TileCoordinates(f.Position()));
+	Vector<int> direction(coords - fCoords);
+
+	if (direction.Y() < 0) {
+		f.SetOrientation(Entity::ORIENTATION_NORTH);
+		f.SetSpeed(walkingSpeed);
+		f.StartAnimation(*this);
+	} else if (direction.X() > 0) {
+		f.SetOrientation(Entity::ORIENTATION_EAST);
+		f.SetSpeed(walkingSpeed);
+		f.StartAnimation(*this);
+	} else if (direction.Y() > 0) {
+		f.SetOrientation(Entity::ORIENTATION_SOUTH);
+		f.SetSpeed(walkingSpeed);
+		f.StartAnimation(*this);
+	} else if (direction.X() < 0) {
+		f.SetOrientation(Entity::ORIENTATION_WEST);
+		f.SetSpeed(walkingSpeed);
+		f.StartAnimation(*this);
+	} else {
+		f.SetSpeed(0.0f);
+		f.StopAnimation();
+	}
+}
 
-	e->Follower()->SetOrientation(e->GetOrientation());
-	// TODO: set follower speed
+void MapState::StopFollowers(Entity &e) {
+	for (Entity *f(e.Follower()); f; f = f->Follower()) {
+		f->SetSpeed(0.0f);
+		f->StopAnimation();
+	}
 }