diff options
| author | Joseph-Eugene Winzer | 2018-03-11 21:47:30 +0100 |
|---|---|---|
| committer | Joseph-Eugene Winzer | 2018-04-14 11:45:52 +0200 |
| commit | 9689dffca9d44ab0a94d01f8fbc38ef0178c67b5 (patch) | |
| tree | 194fb9a8ea12211c5c0cb4f8f87d3f7383310b08 /engines/supernova/state.cpp | |
| parent | 7dab7b775b4472cc65ad59b80562a2164e4d4355 (diff) | |
| download | scummvm-rg350-9689dffca9d44ab0a94d01f8fbc38ef0178c67b5.tar.gz scummvm-rg350-9689dffca9d44ab0a94d01f8fbc38ef0178c67b5.tar.bz2 scummvm-rg350-9689dffca9d44ab0a94d01f8fbc38ef0178c67b5.zip | |
SUPERNOVA: Removes mouseInput3()
The function highlights dialog choices depending on the mouse position
and loops till a mouse button is pressed.
Since it is used in GameManager::dialog() only, inlining it seems
reasonable, especially as the name was not descriptive in the first
place.
Diffstat (limited to 'engines/supernova/state.cpp')
| -rw-r--r-- | engines/supernova/state.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index e41c85be15..8356fe32de 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -1407,7 +1407,12 @@ int GameManager::dialog(int num, byte rowLength[6], StringID text[6], int number _currentSentence = -1; do { - mouseInput3(); + do { + _vm->updateEvents(); + mousePosDialog(_mouseX, _mouseY); + g_system->updateScreen(); + g_system->delayMillis(_vm->_delay); + } while (!_mouseClicked && !_vm->shouldQuit()); } while (_currentSentence == -1 && !_vm->shouldQuit()); _vm->renderBox(0, 138, 320, 62, kColorBlack); @@ -1540,15 +1545,6 @@ void GameManager::getInput() { } } -void GameManager::mouseInput3() { - do { - _vm->updateEvents(); - mousePosDialog(_mouseX, _mouseY); - g_system->updateScreen(); - g_system->delayMillis(_vm->_delay); - } while (!_mouseClicked && !_vm->shouldQuit()); -} - void GameManager::roomBrightness() { _roomBrightness = 255; if ((_currentRoom->getId() != OUTSIDE) && (_currentRoom->getId() < ROCKS) && _state._powerOff) |