[Scummvm-git-logs] scummvm master -> 0c2d9c2e90dc2db363216c11717bd6c10eace09f

[bluegr]

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:
b706745c20 MOHAWK: Mark Story of Creation Mac and Daniel Mac as v3 to get them working
0c2d9c2e90 MOHAWK: Hacks to get the Wanderful sampler working


Commit: b706745c20efad057be5d9e0f0bc1837c00acf5a
    https://github.com/scummvm/scummvm/commit/b706745c20efad057be5d9e0f0bc1837c00acf5a
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-07-05T21:40:25+03:00

Commit Message:
MOHAWK: Mark Story of Creation Mac and Daniel Mac as v3 to get them working

Changed paths:
    engines/mohawk/detection_tables.h


diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 024b7e73664..72eeb8c62c5 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -3101,7 +3101,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOASPECT)
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0,
 	},
@@ -3164,7 +3164,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_DEMO,
 			GUIO1(GUIO_NOASPECT)
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0,
 	},


Commit: 0c2d9c2e90dc2db363216c11717bd6c10eace09f
    https://github.com/scummvm/scummvm/commit/0c2d9c2e90dc2db363216c11717bd6c10eace09f
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-07-05T21:40:25+03:00

Commit Message:
MOHAWK: Hacks to get the Wanderful sampler working

Changed paths:
    engines/mohawk/livingbooks.cpp
    engines/mohawk/livingbooks_code.cpp


diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index e4bbc1388d2..4723b08519d 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -1415,7 +1415,7 @@ void MohawkEngine_LivingBooks::handleNotify(NotifyEvent &event) {
 		debug(2, "kLBNotifyChangeMode: v2 type %d", event.param);
 		switch (event.param) {
 		case 1:
-			debug(2, "kLBNotifyChangeMode:, mode %d, page %d.%d",
+			debug(2, "kLBNotifyChangeMode: mode %d, page %d.%d",
 				event.newMode, event.newPage, event.newSubpage);
 			// TODO: what is entry.newUnknown?
 			if (!event.newMode)
@@ -1728,7 +1728,8 @@ bool LBAnimationNode::transparentAt(int x, int y) {
 LBAnimation::LBAnimation(MohawkEngine_LivingBooks *vm, LBAnimationItem *parent, uint16 resourceId) : _vm(vm), _parent(parent) {
 	Common::SeekableSubReadStreamEndian *aniStream = _vm->wrapStreamEndian(ID_ANI, resourceId);
 
-	if (aniStream->size() != 30)
+	// ANI records in the Wanderful sampler are 32 bytes, extra bytes are just NULs
+	if (aniStream->size() != 30 && aniStream->size() != 32)
 		warning("ANI Record size mismatch");
 
 	uint16 version = aniStream->readUint16();
@@ -1746,6 +1747,9 @@ LBAnimation::LBAnimation(MohawkEngine_LivingBooks *vm, LBAnimationItem *parent,
 	debug(5, "ANI clip: (%d, %d), (%d, %d)", _clip.left, _clip.top, _clip.right, _clip.bottom);
 	debug(5, "ANI color id: %d", colorId);
 	debug(5, "ANI SPRResourceId: %d, offset %d", sprResourceId, sprResourceOffset);
+	if (aniStream->size() == 32) {
+		debug(5, "ANI extra bytes: (%d)", aniStream->readUint16());
+	}
 
 	if (aniStream->pos() != aniStream->size())
 		error("Still %d bytes at the end of anim stream", (int)(aniStream->size() - aniStream->pos()));
diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index 06ce94cf04f..70780f212ae 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1957,7 +1957,7 @@ uint LBCode::parseCode(const Common::String &source) {
 				Common::String tempString;
 				tempString += token;
 				while (pos < source.size()) {
-					if (!Common::isAlpha(source[pos]) && !Common::isDigit(source[pos]))
+					if (!Common::isAlpha(source[pos]) && !Common::isDigit(source[pos]) && source[pos] != '_') // Wanderful sampler uses _ in variables
 						break;
 					tempString += source[pos++];
 				}