[Scummvm-git-logs] scummvm master -> e7446adaf2b734350110d84eb43252639d7805e7

[waltervn]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1693281079 ADL: Error out when picture is not found
113887cdf7 ADL: Fix hires5 room state restoring
e7446adaf2 ADL: Fix hires5 direction opcodes


Commit: 16932810791297ec990f951526a829d2bc33e132
    https://github.com/scummvm/scummvm/commit/16932810791297ec990f951526a829d2bc33e132
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-01-30T00:05:10+01:00

Commit Message:
ADL: Error out when picture is not found

Changed paths:
    engines/adl/adl.cpp


diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 33124a2..55f98df 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -454,8 +454,10 @@ void AdlEngine::clearScreen() const {
 void AdlEngine::drawPic(byte pic, Common::Point pos) const {
 	if (_roomData.pictures.contains(pic))
 		_graphics->drawPic(*_roomData.pictures[pic]->createReadStream(), pos);
-	else
+	else if (_pictures.contains(pic))
 		_graphics->drawPic(*_pictures[pic]->createReadStream(), pos);
+	else
+		error("Picture %d not found", pic);
 }
 
 void AdlEngine::bell(uint count) const {


Commit: 113887cdf727b07a4767a023b3c47450f3c5415a
    https://github.com/scummvm/scummvm/commit/113887cdf727b07a4767a023b3c47450f3c5415a
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-01-30T00:05:10+01:00

Commit Message:
ADL: Fix hires5 room state restoring

Changed paths:
    engines/adl/adl_v4.cpp


diff --git a/engines/adl/adl_v4.cpp b/engines/adl/adl_v4.cpp
index dcf0f99..845c343 100644
--- a/engines/adl/adl_v4.cpp
+++ b/engines/adl/adl_v4.cpp
@@ -378,8 +378,10 @@ void AdlEngine_v4::backupRoomState(byte room) {
 void AdlEngine_v4::restoreRoomState(byte room) {
 	const RoomState &backup = getCurRegion().rooms[room - 1];
 
-	getRoom(room).isFirstTime = backup.isFirstTime;
-	getRoom(room).picture = backup.picture;
+	if (backup.isFirstTime != 1) {
+		getRoom(room).curPicture = getRoom(room).picture = backup.picture;
+		getRoom(room).isFirstTime = false;
+	}
 }
 
 void AdlEngine_v4::backupVars() {


Commit: e7446adaf2b734350110d84eb43252639d7805e7
    https://github.com/scummvm/scummvm/commit/e7446adaf2b734350110d84eb43252639d7805e7
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-01-30T00:05:10+01:00

Commit Message:
ADL: Fix hires5 direction opcodes

Changed paths:
    engines/adl/adl.cpp


diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 55f98df..3deeca1 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -1242,8 +1242,7 @@ int AdlEngine::o1_goDirection(ScriptEnv &e) {
 		return -1;
 	}
 
-	getCurRoom().curPicture = getCurRoom().picture;
-	_state.room = room;
+	switchRoom(room);
 	return -1;
 }