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

[NMIError]

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:
0905638e4a TOON: Mark English demo as unstable
e92cd24d82 TOON: Added some comments on demo differences


Commit: 0905638e4af3f0f5458b0f6db2f8b1e74dcef9f2
    https://github.com/scummvm/scummvm/commit/0905638e4af3f0f5458b0f6db2f8b1e74dcef9f2
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-09-02T22:17:18+02:00

Commit Message:
TOON: Mark English demo as unstable

There seem to be some differences in the data structures between the English
demo and the other versions of the game, which causes ScummVM to reference
invalid animations, hotspots and fonts. Marked it as unstable for now.

Changed paths:
    engines/toon/detection.cpp


diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 84e2cc9112..03ffd120b5 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -115,7 +115,7 @@ static const ADGameDescription gameDescriptions[] = {
 			{"generic.svl", 0, "5c42724bb93b360dca7044d6b7ef26e5", 7739319},
 			AD_LISTEND
 		},
-		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO1(GUIO_NOMIDI)
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_UNSTABLE, GUIO1(GUIO_NOMIDI)
 	},
 	{
 		// English 2-CD "Sold out" release


Commit: e92cd24d824eab973545949d6be089413848403b
    https://github.com/scummvm/scummvm/commit/e92cd24d824eab973545949d6be089413848403b
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-09-02T22:17:18+02:00

Commit Message:
TOON: Added some comments on demo differences

Changed paths:
    engines/toon/character.cpp
    engines/toon/hotspot.cpp
    engines/toon/toon.cpp


diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 84b67cc52e..d68278f9d0 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -681,6 +681,7 @@ const SpecialCharacterAnimation *Character::getSpecialAnimation(int32 characterI
 	debugC(6, kDebugCharacter, "getSpecialAnimation(%d, %d)", characterId, animationId);
 
 	// very nice animation list hardcoded in the executable...
+	// TODO This list does not seem to be correct for the English demo.
 	static const SpecialCharacterAnimation anims[] = {
 		{ "TLK547_?", 9, 0, 0, 0, 0, 0, 1, 5, 8, 1, 8, 0, 255 },
 		{ "TLK555_?", 16, 0, 0, 0, 0, 6, 8, 10, 255, 6, 11, 2, 255 },
diff --git a/engines/toon/hotspot.cpp b/engines/toon/hotspot.cpp
index cdc6dc40d9..cb9e30f5c8 100644
--- a/engines/toon/hotspot.cpp
+++ b/engines/toon/hotspot.cpp
@@ -114,6 +114,8 @@ bool Hotspots::loadRif(const Common::String &rifName, const Common::String &addi
 	int32 rifsize2 = 0;
 
 	if (size2)
+		// TODO This is not correct for the English demo.
+		// The size seems to be a uint16?
 		rifsize2 = READ_BE_UINT32(&rifData2[4]);
 
 	_numItems = (rifsize + rifsize2) / 512;
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index f59d2289af..08b9590d1c 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -2181,6 +2181,7 @@ void ToonEngine::fadeOut(int32 numFrames) {
 }
 
 void ToonEngine::initFonts() {
+	// TODO These font files do not exist in the English demo
 	_fontRenderer = new FontRenderer(this);
 	_fontToon = new Animation(this);
 	_fontToon->loadAnimation("TOONFONT.CAF");