diff options
| author | Andre Heider | 2010-09-05 23:12:03 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-09-05 23:12:03 +0000 |
| commit | a7ff124dfd30032bfaa1897e13d1848c62b30013 (patch) | |
| tree | caae3a25403cf2a3e6a9922608043615a9b71a22 /engines/kyra/text_lol.cpp | |
| parent | cd5e62bbe8234233679861f7421b850ff832efd5 (diff) | |
| parent | f69bfaf355b2544bf8ca8cc6cf3209773b8ad005 (diff) | |
| download | scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.tar.gz scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.tar.bz2 scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.zip | |
MERGE: Merge trunk to branch again to test r52579.
svn-id: r52580
Diffstat (limited to 'engines/kyra/text_lol.cpp')
| -rw-r--r-- | engines/kyra/text_lol.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index d5264be483..7f9531507c 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -204,10 +204,12 @@ void TextDisplayer_LoL::printDialogueText(int dim, char *str, EMCState *script, } void TextDisplayer_LoL::printMessage(uint16 type, const char *str, ...) { - static uint8 textColors256[] = { 0xfe, 0xa2, 0x84, 0x97, 0x9F }; - static uint8 textColors16[] = { 0x33, 0xaa, 0x88, 0x55, 0x99 }; - static uint8 soundEffect[] = { 0x0B, 0x00, 0x2B, 0x1B, 0x00 }; + static const uint8 textColors256[] = { 0xfe, 0xa2, 0x84, 0x97, 0x9F }; + static const uint8 textColors16[] = { 0x33, 0xaa, 0x88, 0x55, 0x99 }; + static const uint8 soundEffect[] = { 0x0B, 0x00, 0x2B, 0x1B, 0x00 }; + const uint8 *textColors = _vm->gameFlags().use16ColorMode ? textColors16 : textColors256; + if (type & 4) type ^= 4; else |