ADL: Rename Room struct fields

3 files changed, 19 insertions, 19 deletions

diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 3ce6d709f8..6109004f8a 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -180,7 +180,7 @@ void AdlEngine::takeItem(byte noun) {
 
 		Common::Array<byte>::const_iterator it2;
 		for (it2 = it->roomPictures.begin(); it->roomPictures.end(); ++it2) {
-			if (*it2 == _rooms[_room].picture) {
+			if (*it2 == _rooms[_room].curPicture) {
 				it->room = IDI_NONE;
 				it->state = IDI_ITEM_MOVED;
 				return;
@@ -237,16 +237,16 @@ void AdlEngine::doActions(const Command &command, byte noun, byte offset) {
 			offset += 3;
 			break;
 		case 6:
-			_rooms[_room].picture = _rooms[_room].field8;
+			_rooms[_room].curPicture = _rooms[_room].picture;
 			_room = command.script[offset + 1];
 			offset += 2;
 			break;
 		case 7:
-			_rooms[_room].picture = command.script[offset + 1];
+			_rooms[_room].curPicture = command.script[offset + 1];
 			offset += 2;
 			break;
 		case 8:
-			_rooms[_room].field8 = _rooms[_room].picture = command.script[offset + 1];
+			_rooms[_room].picture = _rooms[_room].curPicture = command.script[offset + 1];
 			offset += 2;
 			break;
 		case 9:
@@ -297,7 +297,7 @@ void AdlEngine::doActions(const Command &command, byte noun, byte offset) {
 			break;
 		}
 		case 0x14:
-			_rooms[_room].picture = _rooms[_room].field8;
+			_rooms[_room].curPicture = _rooms[_room].picture;
 			++offset;
 			break;
 		case 0x15:
@@ -313,7 +313,7 @@ void AdlEngine::doActions(const Command &command, byte noun, byte offset) {
 				return;
 			}
 
-			_rooms[_room].picture = _rooms[_room].field8;
+			_rooms[_room].curPicture = _rooms[_room].picture;
 			_room = room;
 			return;
 		}
@@ -326,7 +326,7 @@ void AdlEngine::doActions(const Command &command, byte noun, byte offset) {
 			++offset;
 			break;
 		case 0x1d:
-			_rooms[command.script[offset + 1]].field8 = _rooms[command.script[offset + 1]].picture = command.script[offset + 2];
+			_rooms[command.script[offset + 1]].picture = _rooms[command.script[offset + 1]].curPicture = command.script[offset + 2];
 			offset += 3;
 			break;
 		default:
@@ -364,7 +364,7 @@ bool AdlEngine::checkCommand(const Command &command, byte verb, byte noun) {
 			offset += 3;
 			break;
 		case 9:
-			if (_rooms[_room].picture != command.script[offset + 1])
+			if (_rooms[_room].curPicture != command.script[offset + 1])
 				return false;
 			offset += 2;
 			break;
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 4c8180eeab..fffe61eadf 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -74,8 +74,8 @@ enum EngineString {
 struct Room {
 	byte description;
 	byte connections[6];
-	byte field8;
 	byte picture;
+	byte curPicture;
 };
 
 struct Picture {
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index a5dbb894e2..730f229198 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -42,13 +42,13 @@
 namespace Adl {
 
 // Messages used outside of scripts
-#define IDI_HR1_MSG_CANT_GO_THERE 137
-#define IDI_HR1_MSG_DONT_UNDERSTAND 37
-#define IDI_HR1_MSG_ITEM_DOESNT_MOVE 151
-#define IDI_HR1_MSG_ITEM_NOT_HERE 152
+#define IDI_HR1_MSG_CANT_GO_THERE      137
+#define IDI_HR1_MSG_DONT_UNDERSTAND     37
+#define IDI_HR1_MSG_ITEM_DOESNT_MOVE   151
+#define IDI_HR1_MSG_ITEM_NOT_HERE      152
 #define IDI_HR1_MSG_THANKS_FOR_PLAYING 140
-#define IDI_HR1_MSG_DONT_HAVE_IT 127
-#define IDI_HR1_MSG_GETTING_DARK 7
+#define IDI_HR1_MSG_DONT_HAVE_IT       127
+#define IDI_HR1_MSG_GETTING_DARK         7
 
 // Strings embedded in the executable
 enum {
@@ -227,7 +227,7 @@ void HiRes1Engine::drawItems() {
 			continue;
 
 		if (it->state == IDI_ITEM_MOVED) {
-			if (_rooms[_room].field8 == _rooms[_room].picture) {
+			if (_rooms[_room].picture == _rooms[_room].curPicture) {
 				const Common::Point &p =  _itemOffsets[dropped];
 				if (it->isDrawing)
 					_display->drawRightAngles(_drawings[it->picture - 1], Common::Point(p.x, p.y), 0, 1, 0x7f);
@@ -241,7 +241,7 @@ void HiRes1Engine::drawItems() {
 		Common::Array<byte>::const_iterator it2;
 
 		for (it2 = it->roomPictures.begin(); it2 != it->roomPictures.end(); ++it2) {
-			if (*it2 == _rooms[_room].picture) {
+			if (*it2 == _rooms[_room].curPicture) {
 				if (it->isDrawing)
 					_display->drawRightAngles(_drawings[it->picture - 1], it->position, 0, 1, 0x7f);
 				else
@@ -254,7 +254,7 @@ void HiRes1Engine::drawItems() {
 
 void HiRes1Engine::showRoom() {
 	if (!_isDark) {
-		drawPic(_rooms[_room].picture, 0, 0);
+		drawPic(_rooms[_room].curPicture, 0, 0);
 		drawItems();
 	}
 
@@ -294,8 +294,8 @@ void HiRes1Engine::runGame() {
 		room.description = f.readByte();
 		for (uint j = 0; j < 6; ++j)
 			room.connections[j] = f.readByte();
-		room.field8 = f.readByte();
 		room.picture = f.readByte();
+		room.curPicture = f.readByte();
 		_rooms.push_back(room);
 	}