libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SHERLOCK: Implement some differences in loadJournalFile for Rose Tattoo

Browse Source
This commit is contained in:
Filippos Karapetis 2015-06-07 22:19:28 +03:00
parent 9b837c308f
commit 2b543b0662
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/sherlock/journal.cpp
View File

@ -230,7 +230,10 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
if (newLocation != oldLocation) {
// Add in scene title
journalString = "@" + _locations[newLocation - 1] + ":";
journalString = "@";
if (IS_SERRATED_SCALPEL || newLocation - 1 < 100)
journalString += _locations[newLocation - 1];
journalString += ":";
// See if title can fit into a single line, or requires splitting on 2 lines
int width = screen.stringWidth(journalString.c_str() + 1);
@ -283,10 +286,21 @@ 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;
while (*replyP) {
byte c = *replyP++;
if (IS_ROSE_TATTOO) {
// Ignore commented out data
if (c == '/' && *(replyP + 1) == '*') {
replyP++; // skip *
while (*replyP++ != '*') {} // empty loop on purpose
replyP++; // skip /
c = *replyP;
}
}
// Is it a control character?
if (c < opcodes[0]) {
// Nope. Set flag for allowing control codes to insert spaces
@ -326,7 +340,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
} else {
if (talk._talkTo == 1)
journalString += "I";
else if (talk._talkTo == 2)
else if (talk._talkTo == inspectorId)
journalString += "The Inspector";
else
journalString += people._characters[talk._talkTo]._name;
@ -373,7 +387,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
journalString += "Holmes";
else if (c == 1)
journalString += "I";
else if (c == 2)
else if (c == inspectorId)
journalString += "the Inspector";
else
journalString += people._characters[c]._name;