AURORA: Load walkable rooms from Jade lyt files

xoreos · Dec 22, 2017 · b6a838f · b6a838f
1 parent 76ac4b4
commit b6a838f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/aurora/lytfile.cpp b/src/aurora/lytfile.cpp
@@ -92,6 +92,7 @@ void LYTFile::load(Common::SeekableReadStream &lyt) {
 				Common::parseString(strings[1], _rooms[i].x);
 				Common::parseString(strings[2], _rooms[i].y);
 				Common::parseString(strings[3], _rooms[i].z);
+				_rooms[i].canWalk = false;
 			}
 
 		} else if (strings[0] == "trackcount") {
@@ -138,15 +139,24 @@ void LYTFile::load(Common::SeekableReadStream &lyt) {
 			}
 
 		} else if (strings[0] == "walkmeshRooms") {
-			// TODO: Walkmesh rooms?
+			// Only relevant for Jade
 
 			assertTokenCount(strings, 2, "walkmeshRooms");
 
 			int walkmeshRoomCount;
 			Common::parseString(strings[1], walkmeshRoomCount);
 
-			for (int i = 0; i < walkmeshRoomCount; i++)
+			for (int i = 0; i < walkmeshRoomCount; i++) {
 				tokenizer.nextChunk(lyt);
+				tokenizer.getTokens(lyt, strings);
+
+				assertTokenCount(strings, 1, "walkmesh room");
+
+				for (size_t j = 0; j < _rooms.size(); j++) {
+					if (_rooms[j].model.equals(strings[0]))
+						_rooms[j].canWalk = true;
+				}
+			}
 
 		} else if (strings[0] == "doorhookcount") {
 			// Door hooks

diff --git a/src/aurora/lytfile.h b/src/aurora/lytfile.h
@@ -58,6 +58,7 @@ class LYTFile {
 	struct Room {
 		Common::UString model;
 		float x, y, z;
+		bool canWalk;
 	};
 
 	/** A simple, non-interactive placeable. */