[Scummvm-cvs-logs] scummvm master -> 61ec6c998ff839900ce3157c324a133dfbaae4c0
bluegr
bluegr at gmail.com
Sun Feb 17 19:46:39 CET 2013
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:
d830b27404 SCI: Fix bug #3604944 - "SCI: QFG1VGA: Missing dialogue when speaking to Kaspar"
61ec6c998f SCI: Fix bug #3538416 - "SCI: SQ4 CD text glitches in introduction"
Commit: d830b27404b41850be99b49b33da1654a5ba614c
https://github.com/scummvm/scummvm/commit/d830b27404b41850be99b49b33da1654a5ba614c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-02-17T10:44:31-08:00
Commit Message:
SCI: Fix bug #3604944 - "SCI: QFG1VGA: Missing dialogue when speaking to Kaspar"
Changed paths:
engines/sci/engine/message.cpp
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index a92d572..b333d15 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -203,6 +203,13 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
while (1) {
MessageTuple &t = stack.top();
+ // Fix known incorrect message tuples
+ 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
+ t.verb = 2;
+ }
+
if (!reader->findRecord(t, record)) {
// Tuple not found
if (recurse && (stack.size() > 1)) {
Commit: 61ec6c998ff839900ce3157c324a133dfbaae4c0
https://github.com/scummvm/scummvm/commit/61ec6c998ff839900ce3157c324a133dfbaae4c0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-02-17T10:45:16-08:00
Commit Message:
SCI: Fix bug #3538416 - "SCI: SQ4 CD text glitches in introduction"
Changed paths:
engines/sci/engine/message.cpp
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index b333d15..10f8094 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -210,6 +210,25 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
t.verb = 2;
}
+ // Fill in known missing message tuples
+ if (g_sci->getGameId() == GID_SQ4 && stack.getModule() == 16 &&
+ t.noun == 7 && t.verb == 0 && t.cond == 3 && t.seq == 1) {
+ // This fixes the error message shown when speech and subtitles are
+ // enabled simultaneously in SQ4 - the (very) long dialog when Roger
+ // is talking with the aliens is missing - bug #3538416.
+ record.tuple = t;
+ record.refTuple = MessageTuple();
+ record.talker = 7; // Roger
+ // The missing text is just too big to fit in one speech bubble, and
+ // if it's added here manually and drawn on screen, it's painted over
+ // the entrance in the back where the Sequel Police enters, so it
+ // looks very ugly. Perhaps this is why this particular text is missing,
+ // as the text shown in this screen is very short (one-liners).
+ // Just output an empty string here instead of showing an error.
+ record.string = "";
+ return true;
+ }
+
if (!reader->findRecord(t, record)) {
// Tuple not found
if (recurse && (stack.size() > 1)) {
More information about the Scummvm-git-logs
mailing list