diff options
| author | Matthew Stewart | 2018-05-11 02:17:57 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | d375429abef0109a483970975b053292efa4bd6e (patch) | |
| tree | 448bd50bc330010834b3e1f655903bf1b2d7e93e /engines/startrek/text.cpp | |
| parent | fde5f22f9783c557c74d0267d8118c1a0c6d498e (diff) | |
| download | scummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.tar.gz scummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.tar.bz2 scummvm-rg350-d375429abef0109a483970975b053292efa4bd6e.zip | |
STARTREK: Objects and animations.
Testing them with the transporter room.
Diffstat (limited to 'engines/startrek/text.cpp')
| -rw-r--r-- | engines/startrek/text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/startrek/text.cpp b/engines/startrek/text.cpp index 923ebc6c8b..ef5a746756 100644 --- a/engines/startrek/text.cpp +++ b/engines/startrek/text.cpp @@ -68,7 +68,7 @@ int Graphics::showText(TextGetterFunc textGetter, uintptr var, int xoffset, int int16 tmpTextDisplayMode = _textDisplayMode; uint32 var7c = 8; - if (_textboxVar3 > _textboxVar2+1) { + if (_vm->_frameIndex > _textboxVar2+1) { var7c = 0x10; } @@ -291,7 +291,7 @@ reloadText: // sub_272B4 } - _textboxVar2 = _textboxVar3; + _textboxVar2 = _vm->_frameIndex; _vm->stopPlayingSpeech(); return choiceIndex; } @@ -347,7 +347,7 @@ int Graphics::handleMenuEvents(uint32 ticksUntilClickingEnabled, bool arg4) { } } // sub_1E88C(); - _textboxVar3++; + _vm->_frameIndex++; if (ticksUntilClickingEnabled != 0 && _vm->_clockTicks >= tickWhenClickingEnabled) return MENUEVENT_ENABLEINPUT; @@ -818,7 +818,7 @@ void Graphics::loadMenuButtons(String mnuFilename, int xpos, int ypos) { _activeMenu = SharedPtr<Menu>(new Menu()); _activeMenu->nextMenu = oldMenu; - SharedPtr<FileStream> stream = _vm->openFile(mnuFilename + ".MNU"); + SharedPtr<FileStream> stream = _vm->loadFile(mnuFilename + ".MNU"); _activeMenu->menuFile = stream; _activeMenu->numButtons = _activeMenu->menuFile->size() / 16; |