[Scummvm-git-logs] scummvm master -> 4dda6324b83a1fcd7c0dd67053dd62d9883e9ba0

[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:
4dda6324b8 SCI: Fix FPFP CD 'Dummy Msg' message texts


Commit: 4dda6324b83a1fcd7c0dd67053dd62d9883e9ba0
    https://github.com/scummvm/scummvm/commit/4dda6324b83a1fcd7c0dd67053dd62d9883e9ba0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-05-26T13:01:25+03:00

Commit Message:
SCI: Fix FPFP CD 'Dummy Msg' message texts

Fixes 17 message texts, bug #10964

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


diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index c182f6a..88aa735 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -351,6 +351,70 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
 			return true;
 		}
 
+		// FPFP CD has several message sequences where audio and text were left
+		//  out of sync. This is probably because this version didn't formally
+		//  support text mode. Most of these texts just say "Dummy Msg". All the
+		//  real text is there but it's either concatenated or in a different
+		//  tuple. We extract and return the correct text. Fixes #10964
+		if (g_sci->getGameId() == GID_FREDDYPHARKAS && g_sci->isCD() &&
+			g_sci->getLanguage() == Common::EN_ANY && !g_sci->isDemo()) {
+			byte textSeq = 0;
+			uint32 substringIndex = 0;
+			uint32 substringLength = 0;
+
+			// lever brothers' introduction
+			if (stack.getModule() == 220 && t.noun == 24 && t.verb == 0 && t.cond == 0) {
+				switch (t.seq) {
+				case 1: textSeq = 1; substringIndex = 0;   substringLength = 25; break;
+				case 2: textSeq = 1; substringIndex = 26;  substringLength = 20; break;
+				case 3: textSeq = 1; substringIndex = 47;  substringLength = 58; break;
+				case 4: textSeq = 1; substringIndex = 106; substringLength = 34; break;
+				case 5: textSeq = 1; substringIndex = 141; substringLength = 27; break;
+				case 6: textSeq = 1; substringIndex = 169; substringLength = 29; break;
+				case 7: textSeq = 1; substringIndex = 199; substringLength = 52; break;
+				case 8: textSeq = 1; substringIndex = 252; substringLength = 37; break;
+				}
+			}
+
+			// kenny's introduction
+			if (stack.getModule() == 220 && t.noun == 30 && t.verb == 0 && t.cond == 0) {
+				switch (t.seq) {
+				case 3: textSeq = 3; substringIndex = 0;  substringLength = 14;  break;
+				case 4: textSeq = 3; substringIndex = 15; substringLength = 245; break;
+				case 5: textSeq = 4; break;
+				}
+			}
+
+			// helen swatting flies
+			if (stack.getModule() == 660 && t.noun == 35 && t.verb == 0 && t.cond == 0) {
+				switch (t.seq) {
+				case 1: textSeq = 1; substringIndex = 0;   substringLength = 42; break;
+				case 2: textSeq = 1; substringIndex = 43;  substringLength = 93; break;
+				case 3: textSeq = 1; substringIndex = 137; substringLength = 72; break;
+				case 4: textSeq = 2; break;
+				case 5: textSeq = 1; substringIndex = 210; substringLength = 57; break;
+				case 6: textSeq = 3; break;
+				}
+			}
+
+			// find the original message record and the record that contains the
+			//  correct text, then use the correct substring. the original must
+			//  be used to preserve its correct talker and tuple values.
+			if (textSeq != 0 && reader->findRecord(t, record)) {
+				MessageTuple textTuple(t.noun, t.verb, t.cond, textSeq);
+				MessageRecord textRecord;
+				if (reader->findRecord(textTuple, textRecord)) {
+					uint32 textLength = (substringLength == 0) ? textRecord.length : substringLength;
+					if (substringIndex + textLength <= textRecord.length) {
+						record.string = textRecord.string + substringIndex;
+						record.length = textLength;
+						delete reader;
+						return true;
+					}
+				}
+			}
+		}
+
 		if (!reader->findRecord(t, record)) {
 			// Tuple not found
 			if (recurse && (stack.size() > 1)) {
@@ -387,7 +451,7 @@ int MessageState::nextMessage(reg_t buf) {
 
 	if (!buf.isNull()) {
 		if (getRecord(_cursorStack, true, record)) {
-			outputString(buf, processString(record.string));
+			outputString(buf, processString(record.string, record.length));
 			_lastReturned = record.tuple;
 			_lastReturnedModule = _cursorStack.getModule();
 			_cursorStack.top().seq++;
@@ -521,13 +585,13 @@ bool MessageState::stringStage(Common::String &outstr, const Common::String &inS
 	return false;
 }
 
-Common::String MessageState::processString(const char *s) {
+Common::String MessageState::processString(const char *s, uint32 maxLength) {
 	Common::String outStr;
 	Common::String inStr = Common::String(s);
 
 	uint index = 0;
 
-	while (index < inStr.size()) {
+	while (index < inStr.size() && index < maxLength) {
 		// Check for hex escape sequence
 		if (stringHex(outStr, inStr, index))
 			continue;
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index a4de19b..8a1c548 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -77,7 +77,7 @@ public:
 private:
 	bool getRecord(CursorStack &stack, bool recurse, MessageRecord &record);
 	void outputString(reg_t buf, const Common::String &str);
-	Common::String processString(const char *s);
+	Common::String processString(const char *s, uint32 maxLength);
 	int hexDigitToWrongInt(char h);
 	bool stringHex(Common::String &outStr, const Common::String &inStr, uint &index);
 	bool stringLit(Common::String &outStr, const Common::String &inStr, uint &index);