IMMORTAL: levelLoadFile initializes level doors

engines/immortal/door.cpp

@@ -28,7 +28,7 @@
 namespace Immortal {
 
 enum DoorMask {
-	kDoorXMask = 0x1f,
+	kDoorXMask = 0x1f,                  // Only relevant for extracting the data from the compressed bytes in the story record
 	kDoorYMask = 0x1f,
 	kDoorFullMask = 0x40,
 	kDoorOnMask = 0x60
@@ -54,7 +54,17 @@ void ImmortalEngine::doorOpenSecret() {}
 void ImmortalEngine::doorCloseSecret() {}
 void ImmortalEngine::doorInit() {}
 void ImmortalEngine::doorClrLock() {}
-void ImmortalEngine::doorNew() {}
+void ImmortalEngine::doorNew(SDoor door) {
+	Door d;
+	d._x = door._x;
+	d._y = door._y;
+	d._fromRoom = door._fromRoom;
+	d._toRoom = door._toRoom;
+	d._busyOnRight = door._dir | door._x;
+	d._on = door._y & kDoorYMask;
+	_doors.push_back(d);
+}
+
 void ImmortalEngine::doorDrawAll() {}
 void ImmortalEngine::doorOnDoorMat() {}
  int ImmortalEngine::findDoorTop(int x, int y) {

engines/immortal/immortal.h

@@ -144,13 +144,12 @@ struct GenericSprite {
 struct Door {
 	uint8 _x 		   = 0;
 	uint8 _y 		   = 0;
-	uint8 _from		   = 0;
-	uint8 _to		   = 0;
+	uint8 _fromRoom	   = 0;
+	uint8 _toRoom	   = 0;
 	uint8 _busyOnRight = 0;
 	uint8 _on 		   = 0;
 };
 
-
 // Sprites are handled by driver in Kernal
 struct Frame {
 	uint16  _deltaX;
@@ -333,8 +332,8 @@ public:
 	  int _initialBX;
 	  int _initialBY;
 	  int _dRoomNum;
-	  int _initialRoom;
-	  int _currentRoom;
+	  int _initialRoom	= 0;
+	  int _currentRoom	= 0;
 	  int _lastType;
 	  int _roomCellX;
 	  int _roomCellY;
@@ -342,6 +341,7 @@ public:
 	Common::Array<SFlame> _allFlames[kMaxRooms];		// The level needs it's own set of flames so that the flames can be turned on/off permenantly. This is technically more like a hashmap in the source, but it could also be seen as a 2d array, just hashed together in the source
 
 	// Door members
+	Common::Array<Door> _doors;
 	uint8 _numDoors 	   = 0;
 	uint8 _doorRoom 	   = 0;
 	uint8 _doorToNextLevel = 0;
@@ -662,7 +662,7 @@ GenericSprite _genSprites[6];
 	//void doorToNextLevel();
 	void doorInit();
 	void doorClrLock();
-	void doorNew();
+	void doorNew(SDoor door);
 	void doorDrawAll();
 	void doorOnDoorMat();
 	//void doorEnter();	// <-- this is actually a method of Player Monster, should probably move it there later		

engines/immortal/level.cpp

@@ -63,8 +63,6 @@ void ImmortalEngine::levelStory(int l) {
 }
 
 void ImmortalEngine::levelLoadFile(int l) {
-	//	_dRoomNum = 0;
-
 	/* This was originally a large branching tree that checked the identifier of each entry and
 	 * Processed them all for the story. Once again, this would have been better as an indexed
 	 * JSR instead of a set of comparisons and branches. Regardless, we instead use the information
@@ -73,9 +71,14 @@ void ImmortalEngine::levelLoadFile(int l) {
 
 	// Create the rooms and doors, then populate the rooms with their objects and actors
 	debug("loading level file...");
+
+	for (int d = 0; d < _stories[l]._doors.size(); d++) {
+		doorNew(_stories[l]._doors[d]);
+		debug("door %d", d);
+	}
+
 	for (int r = 0; r < _stories[l]._rooms.size(); r++) {
 		_rooms[r] = new Room(_stories[l]._rooms[r]._x, _stories[l]._rooms[r]._y, _stories[l]._rooms[r]._flags);
-		//doorNew(_stories[l]._doors[r]);
 		debug("Room %d", r);
 
 		Common::Array<SFlame> allFlames(_stories[l]._flames[r].size());
@@ -130,7 +133,7 @@ void ImmortalEngine::levelDrawAll() {
 	_count++;
 	//univAutoCenter();
 	clearSprites();
-	//rooms[_currentRoom].drawContents();
+	_rooms[_currentRoom]->drawContents();
 }
 
 void ImmortalEngine::levelShowRoom(int r, int bX, int bY) {

engines/immortal/story.cpp

@@ -102,10 +102,10 @@ void ImmortalEngine::initStoryDynamic() {
 
 	/* All of the doors
 	 */
-	Common::Array<SDoor> doors{SDoor(kLeft, 704, 224, 0, 2, false), SDoor(kRight, 576, 352, 4, 0, true),
-					  		   SDoor(kRight, 704,96, 2, 1, false), SDoor(kRight, 960,128, 7, 2, false),
-					  		   SDoor(kRight, 1088,160, 3, 7, false), SDoor(kRight, 1088,320, 6, 3, false),
-					  		   SDoor(kRight, 896,416, 4, 3, false)};
+	Common::Array<SDoor> doors{SDoor(0, 704, 224, 0, 2, false), SDoor(1, 576, 352, 4, 0, true),
+					  		   SDoor(1, 704, 96,  2, 1, false), SDoor(1, 960, 128, 7, 2, false),
+					  		   SDoor(1, 1088,160, 3, 7, false), SDoor(1, 1088,320, 6, 3, false),
+					  		   SDoor(1, 896, 416, 4, 3, false)};
 	_stories[0]._doors = doors;
 
 	/* All of the flames

engines/immortal/story.h

@@ -99,11 +99,6 @@ enum FPattern : uint8 {							// This defines which Cyc animation it uses
 	kFlameGusty
 };
 
-enum DoorDir : bool {
-	kLeft  = false,
-	kRight = true
-};
-
 // Cycles define the animation of sprites within a level. There is a fixed total of cycles available, and they are not room dependant
 struct Cycle {
 DataSprite *_dSprite;
@@ -163,14 +158,14 @@ struct SRoom {
 };
 
 struct SDoor {
-DoorDir _dir = kLeft;
-	uint8 _x = 0;
-	uint8 _y = 0;
+  uint8 _dir = 0;
+	uint8 _x   = 0;
+	uint8 _y   = 0;
 	uint8 _fromRoom = 0;
-	uint8 _toRoom = 0;
+	uint8 _toRoom   = 0;
 	 bool _isLocked = false;
 	 SDoor() {}
-	 SDoor(DoorDir d, uint8 x, uint8 y, uint8 f, uint8 t, bool l) {
+	 SDoor(uint8 d, uint8 x, uint8 y, uint8 f, uint8 t, bool l) {
 	 	_dir = d;
 	 	_x = x;
 	 	_y = y;