thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPERNOVA: Removes mouseInput3()

Browse source 
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.
This commit is contained in:
Joseph-Eugene Winzer 2018-03-11 21:47:30 +01:00
parent 7dab7b775b
commit 9689dffca9
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/supernova/state.cpp
View file

@ -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)