diff options
| author | BLooperZ | 2019-11-08 00:40:58 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-18 02:02:14 +0100 |
| commit | 32b9b7226ca35eb2b47ff0a030472f78640101cd (patch) | |
| tree | 779036d21b2881ddf6a1e2612db292d637d14708 /engines/toon/toon.cpp | |
| parent | e87e18052c517737c7327ada531fb737fafa5ef4 (diff) | |
| download | scummvm-rg350-32b9b7226ca35eb2b47ff0a030472f78640101cd.tar.gz scummvm-rg350-32b9b7226ca35eb2b47ff0a030472f78640101cd.tar.bz2 scummvm-rg350-32b9b7226ca35eb2b47ff0a030472f78640101cd.zip | |
TOON: plaintext format for subtitles
Diffstat (limited to 'engines/toon/toon.cpp')
| -rw-r--r-- | engines/toon/toon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 2407966567..0f03536f66 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1434,7 +1434,7 @@ void ToonEngine::updateAnimationSceneScripts(int32 timeElapsed) { do { if (_sceneAnimationScripts[_lastProcessedSceneScript]._lastTimer <= _system->getMillis() && - !_sceneAnimationScripts[_lastProcessedSceneScript]._frozen && !_sceneAnimationScripts[_lastProcessedSceneScript]._frozenForConversation) { + !_sceneAnimationScripts[_lastProcessedSceneScript]._frozen && !_sceneAnimationScripts[_lastProcessedSceneScript]._frozenForConversation) { _animationSceneScriptRunFlag = true; while (_animationSceneScriptRunFlag && _sceneAnimationScripts[_lastProcessedSceneScript]._lastTimer <= _system->getMillis() && !_shouldQuit) { @@ -2992,8 +2992,8 @@ int32 ToonEngine::showInventory() { int32 x = 57 * (i % 7) + 114; int32 y = ((9 * (i % 7)) & 0xf) + 56 * (i / 7) + 80; if (_mouseX >= (_gameState->_currentScrollValue + x - 6) && - _mouseX <= (_gameState->_currentScrollValue + x + 44 + 7) && - _mouseY >= y - 6 && _mouseY <= y + 50) { + _mouseX <= (_gameState->_currentScrollValue + x + 44 + 7) && + _mouseY >= y - 6 && _mouseY <= y + 50) { foundObj = i; break; } @@ -3297,7 +3297,7 @@ void ToonEngine::drawConversationLine() { } } -void ToonEngine::drawCustomText(int16 x, int16 y, char *line, Graphics::Surface *frame, byte color) { +void ToonEngine::drawCustomText(int16 x, int16 y, const char *line, Graphics::Surface *frame, byte color) { if (line) { byte col = color; // 0xce _fontRenderer->setFontColor(0, col, col); |