libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SUPERNOVA: Removes optional parameter for getKeyInput()

Browse Source 
It doesn't serve a purpose anymore. The parameter was used to keep
waiting for key input if it was a 'non text editing' event, like
pressing the shift modifier key. The only place it was used was for text
input when interacting with the computer in ShipSleepCabin.
This commit is contained in:
Joseph-Eugene Winzer 2019-05-26 18:15:45 +02:00
parent 6da729171c
commit 7c3b128661
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/supernova/state.cpp
View File

@ -1579,29 +1579,11 @@ void GameManager::drawInventory() {
}
}
uint16 GameManager::getKeyInput(bool blockForPrintChar) {
int GameManager::getKeyInput() {
while (!_vm->shouldQuit()) {
updateEvents();
if (_keyPressed) {
if (blockForPrintChar) {
if (Common::isPrint(_key.keycode) ||
_key.keycode == Common::KEYCODE_BACKSPACE ||
_key.keycode == Common::KEYCODE_DELETE ||
_key.keycode == Common::KEYCODE_RETURN ||
_key.keycode == Common::KEYCODE_SPACE ||
_key.keycode == Common::KEYCODE_ESCAPE ||
_key.keycode == Common::KEYCODE_UP ||
_key.keycode == Common::KEYCODE_DOWN ||
_key.keycode == Common::KEYCODE_LEFT ||
_key.keycode == Common::KEYCODE_RIGHT) {
if (_key.flags & Common::KBD_SHIFT)
return toupper(_key.ascii);
else
return tolower(_key.ascii);
}
} else {
return _key.ascii;
}
return _key.ascii;
}
g_system->updateScreen();
g_system->delayMillis(_vm->_delay);
@ -1805,7 +1787,7 @@ void GameManager::edit(Common::String &input, int x, int y, uint length) {
_vm->renderBox(_vm->_screen->getTextCursorPos().x, y - 1, 1, 9, kColorWhite99);
}
getKeyInput(true);
getKeyInput();
if (_vm->shouldQuit())
break;
switch (_key.keycode) {

2
engines/supernova/state.h
View File

@ -192,7 +192,7 @@ public:
bool airless();
void shock();
Common::EventType getMouseInput();
uint16 getKeyInput(bool blockForPrintChar = false);
int getKeyInput();
void getInput();
void wait(int ticks);
void waitOnInput(int ticks);