ACCESS: Fix RoomInfo for the demo version, fix a typo in a comment

scummvm · Dec 13, 2014 · f968553 · f968553
1 parent 66f9d71
commit f968553
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
@@ -211,7 +211,7 @@ void FileManager::setAppended(Resource *res, int fileNum) {
 	if (!res->_file.open(_filenames[fileNum]))
 		error("Could not open file %s", _filenames[fileNum]);
 
-	// If a different file has been opened then previously, load it's index
+	// If a different file has been opened then previously, load its index
 	if (_fileNumber != fileNum) {
 		_fileNumber = fileNum;
 

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
@@ -167,7 +167,7 @@ void Room::clearRoom() {
 }
 
 void Room::loadRoomData(const byte *roomData) {
-	RoomInfo roomInfo(roomData, _vm->getGameID(), _vm->isCD());
+	RoomInfo roomInfo(roomData, _vm->getGameID(), _vm->isCD(), _vm->isDemo());
 
 	_roomFlag = roomInfo._roomFlag;
 
@@ -777,7 +777,7 @@ bool Room::checkCode(int v1, int v2) {
 
 /*------------------------------------------------------------------------*/
 
-RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
+RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD, bool isDemo) {
 	Common::MemoryReadStream stream(data, 999);
 
 	_roomFlag = stream.readByte();
@@ -787,7 +787,8 @@ RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
 			_estIndex = stream.readSint16LE();
 		else {
 			_estIndex = -1;
-			stream.readSint16LE();
+			if (!isDemo)
+				stream.readSint16LE();
 		}
 	} else
 		_estIndex = -1;

diff --git a/engines/access/room.h b/engines/access/room.h
@@ -194,7 +194,7 @@ class RoomInfo {
 	Common::Array<ExtraCell> _extraCells;
 	Common::Array<SoundIdent> _sounds;
 public:
-	RoomInfo(const byte *data, int gameType, bool isCD);
+	RoomInfo(const byte *data, int gameType, bool isCD, bool isDemo);
 };
 
 } // End of namespace Access