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

LAB: More use of Common::KEYCODEs

Browse source
This commit is contained in:
Strangerke 2015-12-16 01:34:22 +01:00 • committed by Willem Jan Palenstijn
parent 802a0d09dc
commit de6de51e8b
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/lab/engine.cpp
View file

@ -805,26 +805,24 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
} }
bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &qualifier, Common::Point &curPos, uint16 &curInv, bool &forceDraw, uint16 code) { bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &qualifier, Common::Point &curPos, uint16 &curInv, bool &forceDraw, uint16 code) {
byte codeLower = tolower(code);
if (code == Common::KEYCODE_RETURN) { if (code == Common::KEYCODE_RETURN) {
// The return key // The return key
msgClass = MOUSEBUTTONS; msgClass = MOUSEBUTTONS;
qualifier = IEQUALIFIER_LEFTBUTTON; qualifier = IEQUALIFIER_LEFTBUTTON;
curPos = _event->getMousePos(); curPos = _event->getMousePos();
} else if (getPlatform() == Common::kPlatformWindows && codeLower == 'b') { } else if ((getPlatform() == Common::kPlatformWindows) && (code == Common::KEYCODE_b)) {
// Start bread crumbs // Start bread crumbs
_breadCrumbs[0]._roomNum = 0; _breadCrumbs[0]._roomNum = 0;
_numCrumbs = 0; _numCrumbs = 0;
_droppingCrumbs = true; _droppingCrumbs = true;
mayShowCrumbIndicator(); mayShowCrumbIndicator();
_graphics->screenUpdate(); _graphics->screenUpdate();
} else if (codeLower == 'f' || codeLower == 'r') { } else if ((code == Common::KEYCODE_f) || (code == Common::KEYCODE_r)) {
// Follow bread crumbs // Follow bread crumbs
if (_droppingCrumbs) { if (_droppingCrumbs) {
if (_numCrumbs > 0) { if (_numCrumbs > 0) {
_followingCrumbs = true; _followingCrumbs = true;
_followCrumbsFast = (codeLower == 'r'); _followCrumbsFast = (code == Common::KEYCODE_r);
_isCrumbTurning = false; _isCrumbTurning = false;
_isCrumbWaiting = false; _isCrumbWaiting = false;
_crumbTimestamp = g_system->getMillis(); _crumbTimestamp = g_system->getMillis();
@ -851,7 +849,7 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
_graphics->screenUpdate(); _graphics->screenUpdate();
} }
} }
} else if (code == 315 || codeLower == 'x' || codeLower == 'q') { } else if ((code == Common::KEYCODE_x) || (code == Common::KEYCODE_q)) {
// Quit? // Quit?
_graphics->_doNotDrawMessage = false; _graphics->_doNotDrawMessage = false;
_graphics->drawMessage("Do you want to quit? (Y/N)"); _graphics->drawMessage("Do you want to quit? (Y/N)");
@ -871,8 +869,7 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
_music->updateMusic(); _music->updateMusic();
_anim->diffNextFrame(); _anim->diffNextFrame();
} else if (curMsg->_msgClass == RAWKEY) { } else if (curMsg->_msgClass == RAWKEY) {
codeLower = tolower(curMsg->_code); if ((curMsg->_code == Common::KEYCODE_y) || (curMsg->_code == Common::KEYCODE_q)) {
if (codeLower == 'y' || codeLower == 'q') {
_anim->stopDiff(); _anim->stopDiff();
return false; return false;
} else if (curMsg->_code < 128) } else if (curMsg->_code < 128)