diff options
author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/scumm/string.cpp | |
parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/scumm/string.cpp')
-rw-r--r-- | engines/scumm/string.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 83b4e90cf6..993c8e93e0 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" @@ -163,7 +163,7 @@ void ScummEngine_v6::drawBlastTexts() { do { c = *buf++; - + // FIXME: This is a workaround for bugs #864030 and #1399843: // In COMI, some text contains ASCII character 11 = 0xB. It's // not quite clear what it is good for; so for now we just ignore @@ -171,7 +171,7 @@ void ScummEngine_v6::drawBlastTexts() { // this is a 'vertical tab'). if (c == 0x0B) continue; - + // Some localizations may override colors // See credits in Chinese COMI if (c == '^' && (buf == _blastTextQueue[i].text + 1)) { @@ -568,7 +568,7 @@ void ScummEngine::CHARSET_1() { if (c == 13) { newLine:; _nextLeft = _string[0].xpos; -#ifndef DISABLE_SCUMM_7_8 +#ifndef DISABLE_SCUMM_7_8 if (_game.version >= 7 && subtitleLine != subtitleBuffer) { ((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID()); subtitleLine = subtitleBuffer; @@ -1023,7 +1023,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize) *dst++ = 0xE1; continue; } - + // WORKAROUND for bug #1514457: Yet another script bug in Indy3. // Once more a german 'sz' was encoded incorrectly, but this time // they simply encoded it as 0xFF instead of 0xE1. Happens twice |