[Scummvm-git-logs] scummvm master -> 8d4330a217200f646a7402c41ea1fd5d28667de9

[bluegr]

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

Summary:
8d4330a217 SCI: Add some TODOs for better handling of wrong / missing resources


Commit: 8d4330a217200f646a7402c41ea1fd5d28667de9
    https://github.com/scummvm/scummvm/commit/8d4330a217200f646a7402c41ea1fd5d28667de9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-12-02T23:58:44+02:00

Commit Message:
SCI: Add some TODOs for better handling of wrong / missing resources

Changed paths:
    engines/sci/engine/message.cpp
    engines/sci/resource_audio.cpp


diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 3130abb..aa961c9 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -228,6 +228,9 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
 		MessageTuple &t = stack.top();
 
 		// Fix known incorrect message tuples
+		// TODO: Add a more generic mechanism, like the one we have for
+		// script workarounds, for cases with incorrect sync resources,
+		// like the ones below.
 		if (g_sci->getGameId() == GID_QFG1VGA && stack.getModule() == 322 &&
 			t.noun == 14 && t.verb == 1 && t.cond == 19 && t.seq == 1) {
 			// Talking to Kaspar the shopkeeper - bug #3604944
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 2e88566..2f713e4 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -476,6 +476,8 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) {
 				// FIXME: The sync36 resource seems to be two bytes too big in KQ6CD
 				// (bytes taken from the RAVE resource right after it)
 				if (syncSize > 0) {
+					// TODO: Add a mechanism to handle cases with missing resources like the ones below
+					//
 					// LB2CD is missing the sync resource for message 1885 1 6 30 2 but it's a duplicate
 					//  of 1885 1 6 16 2 which does have a sync resource so use that for both. bug #9956
 					if (g_sci->getGameId() == GID_LAURABOW2 && map->_mapNumber == 1885 && n == 0x01061002) {