[Scummvm-git-logs] scummvm master -> 26031080224d194da24bfa6c78258406c6855e7b

[dreammaster]

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:
2603108022 SHERLOCK: Fix misattribution in Rose Tattoo journal


Commit: 26031080224d194da24bfa6c78258406c6855e7b
    https://github.com/scummvm/scummvm/commit/26031080224d194da24bfa6c78258406c6855e7b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2019-01-13T17:15:39-08:00

Commit Message:
SHERLOCK: Fix misattribution in Rose Tattoo journal

Some messages spoken to Watson show up in the journal as if spoken
to the inspector. (And, presumably, the other way around, but I
haven't gotten that far in playing the game yet.)

Changed paths:
    engines/sherlock/journal.cpp


diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 7c2d1c2..9660399 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -379,6 +379,8 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 		journalString += '\n';
 	}
 
+	const int inspectorId = (IS_SERRATED_SCALPEL) ? 2 : 18;
+
 	// If Holmes has something to say first, then take care of it
 	if (!replyOnly) {
 		// Handle the grammar
@@ -391,13 +393,13 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			if (asked)
 				journalString += fixedText.getJournalText(kFixedJournalText_HolmesAskedMe);
 			else
-				journalString += fixedText.getJournalText(kFixedJournalText_HolmesSaidToTheInspector);
+				journalString += fixedText.getJournalText(kFixedJournalText_HolmesSaidToMe);
 
-		} else if ((talk._talkTo == 2 && IS_SERRATED_SCALPEL) || (talk._talkTo == 18 && IS_ROSE_TATTOO)) {
+		} else if (talk._talkTo == inspectorId) {
 			if (asked)
 				journalString += fixedText.getJournalText(kFixedJournalText_HolmesAskedTheInspector);
 			else
-				journalString += fixedText.getJournalText(kFixedJournalText_HolmesSaidToMe);
+				journalString += fixedText.getJournalText(kFixedJournalText_HolmesSaidToTheInspector);
 
 		} else {
 			const char *text = nullptr;
@@ -421,7 +423,6 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 	bool commentFlag = false;
 	bool commentJustPrinted = false;
 	const byte *replyP = (const byte *)statement._reply.c_str();
-	const int inspectorId = (IS_SERRATED_SCALPEL) ? 2 : 18;
 	int beforeLastSpeakerChange = journalString.size();
 	bool justChangedSpeaker = true;