[Scummvm-cvs-logs] scummvm master -> ba606e369338dcb77946f82ba02ed1ca266f28d5

[fuzzie]

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

Summary:
5acac402af MOHAWK: Seek to first frame on kLBOpRewind.
ba606e3693 MOHAWK: Don't warn about odd LB version record sizes.


Commit: 5acac402af8d31cae2b10884fab4d7571fdc2cca
    https://github.com/scummvm/scummvm/commit/5acac402af8d31cae2b10884fab4d7571fdc2cca
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-11T10:15:56-08:00

Commit Message:
MOHAWK: Seek to first frame on kLBOpRewind.

This might need some further thought when implementing more complex
seeking for the later games, but works for now.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 13dc07a..5d6c57a 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -2443,7 +2443,7 @@ void LBItem::runScriptEntry(LBScriptEntry *entry) {
 			break;
 
 		case kLBOpRewind:
-			target->seek(0);
+			target->seek(1);
 			break;
 
 		case kLBOpStop:


Commit: ba606e369338dcb77946f82ba02ed1ca266f28d5
    https://github.com/scummvm/scummvm/commit/ba606e369338dcb77946f82ba02ed1ca266f28d5
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-11T10:15:56-08:00

Commit Message:
MOHAWK: Don't warn about odd LB version record sizes.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 5d6c57a..1f07c9e 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -555,8 +555,9 @@ void MohawkEngine_LivingBooks::queueDelayedEvent(DelayedEvent event) {
 uint16 MohawkEngine_LivingBooks::getResourceVersion() {
 	Common::SeekableReadStream *versionStream = getResource(ID_VRSN, 1000);
 
+	// FIXME: some V2 games have very strange version entries
 	if (versionStream->size() != 2)
-		warning("Version Record size mismatch");
+		debug(1, "Version Record size mismatch");
 
 	uint16 version = versionStream->readUint16BE();