diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/text_lok.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/text_lok.cpp')
| -rw-r--r-- | engines/kyra/text_lok.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index 0ee3574903..62bdf18816 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -188,7 +188,7 @@ int8 KyraEngine_LoK::getChatPartnerNum() { for (int i = 1; i < 6; i++) { if (_currentCharacter->sceneId == sceneTable[pos]) { - partner = sceneTable[pos+1]; + partner = sceneTable[pos + 1]; break; } pos += 2; @@ -342,12 +342,12 @@ void KyraEngine_LoK::drawSentenceCommand(const char *sentence, int color) { _currSentenceColor[2] = 0x3F; _screen->setInterfacePalette(_screen->getPalette(1), - _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]); + _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]); } } else if (_startSentencePalIndex != color || _fadeText != false) { - _currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color*3+0]; - _currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color*3+1]; - _currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color*3+2]; + _currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color * 3 + 0]; + _currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color * 3 + 1]; + _currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color * 3 + 2]; _screen->setScreenPalette(_screen->getPalette(0)); _startSentencePalIndex = color; @@ -377,16 +377,15 @@ void KyraEngine_LoK::updateTextFade() { for (int i = 0; i < 3; i++) { if (_currSentenceColor[i] > 4) _currSentenceColor[i] -= 4; - else - if (_currSentenceColor[i]) { - _currSentenceColor[i] = 0; - finished = true; - } + else if (_currSentenceColor[i]) { + _currSentenceColor[i] = 0; + finished = true; + } } if (_flags.platform == Common::kPlatformAmiga) { _screen->setInterfacePalette(_screen->getPalette(1), - _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]); + _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]); } else { _screen->getPalette(0)[765] = _currSentenceColor[0]; _screen->getPalette(0)[766] = _currSentenceColor[1]; |