Ticket #4759: 3 - convert_engines_to_use_new_hasFlags_method.patch
File 3 - convert_engines_to_use_new_hasFlags_method.patch, 23.1 KB (added by , 14 years ago) |
---|
-
engines/agi/agi.cpp
121 121 _mouse.y = event.mouse.y; 122 122 break; 123 123 case Common::EVENT_KEYDOWN: 124 if (event.kbd. flags == Common::KBD_CTRL&& event.kbd.keycode == Common::KEYCODE_d) {124 if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_d) { 125 125 _console->attach(); 126 126 break; 127 127 } -
engines/agi/preagi_troll.cpp
104 104 case Common::KEYCODE_KP_ENTER: 105 105 return true; 106 106 case Common::KEYCODE_s: 107 if (event.kbd. flags == Common::KBD_CTRL) {107 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 108 108 if (_soundOn) { 109 109 playTune(2, 1); 110 110 _soundOn = !_soundOn; -
engines/agos/event.cpp
459 459 switch (event.type) { 460 460 case Common::EVENT_KEYDOWN: 461 461 if (event.kbd.keycode >= Common::KEYCODE_0 && event.kbd.keycode <= Common::KEYCODE_9 462 && (event.kbd. flags == Common::KBD_ALT||463 event.kbd. flags == Common::KBD_CTRL)) {462 && (event.kbd.hasFlags(Common::KBD_ALT) || 463 event.kbd.hasFlags(Common::KBD_CTRL))) { 464 464 _saveLoadSlot = event.kbd.keycode - Common::KEYCODE_0; 465 465 466 466 // There is no save slot 0 … … 469 469 470 470 memset(_saveLoadName, 0, sizeof(_saveLoadName)); 471 471 sprintf(_saveLoadName, "Quick %d", _saveLoadSlot); 472 _saveLoadType = (event.kbd. flags == Common::KBD_ALT) ? 1 : 2;472 _saveLoadType = (event.kbd.hasFlags(Common::KBD_ALT)) ? 1 : 2; 473 473 474 474 // We should only allow a load or save when it was possible in original 475 475 // This stops load/save during copy protection, conversations and cut scenes 476 476 if (!_mouseHideCount && !_showPreposition) 477 477 quickLoadOrSave(); 478 } else if (event.kbd. flags == Common::KBD_CTRL) {478 } else if (event.kbd.hasFlags(Common::KBD_CTRL)) { 479 479 if (event.kbd.keycode == Common::KEYCODE_a) { 480 480 GUI::Dialog *_aboutDialog; 481 481 _aboutDialog = new GUI::AboutDialog(); … … 492 492 } 493 493 494 494 if (getGameType() == GType_PP) { 495 if (event.kbd. flags == Common::KBD_SHIFT)495 if (event.kbd.hasFlags(Common::KBD_SHIFT)) 496 496 _variableArray[41] = 0; 497 497 else 498 498 _variableArray[41] = 1; -
engines/cruise/cruise_main.cpp
1759 1759 break; 1760 1760 } 1761 1761 1762 if (event.kbd. flags == Common::KBD_CTRL) {1762 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 1763 1763 if (event.kbd.keycode == Common::KEYCODE_d) { 1764 1764 // Start the debugger 1765 1765 _vm->getDebugger()->attach(); -
engines/draci/draci.cpp
293 293 } 294 294 break; 295 295 case Common::KEYCODE_F5: 296 if (event.kbd. flags == 0) {296 if (event.kbd.hasFlags(0)) { 297 297 openMainMenuDialog(); 298 298 } 299 299 break; -
engines/gob/gob.cpp
109 109 110 110 void PauseDialog::handleKeyDown(Common::KeyState state) { 111 111 // Close on CTRL+p 112 if ((state. flags == Common::KBD_CTRL) && (state.keycode == Common::KEYCODE_p))112 if ((state.hasFlags(Common::KBD_CTRL)) && (state.keycode == Common::KEYCODE_p)) 113 113 close(); 114 114 } 115 115 -
engines/gob/util.cpp
114 114 _mouseButtons = (MouseButtons) (((uint32) _mouseButtons) & ~((uint32) kMouseButtonsRight)); 115 115 break; 116 116 case Common::EVENT_KEYDOWN: 117 if (event.kbd. flags == Common::KBD_CTRL) {117 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 118 118 if (event.kbd.keycode == Common::KEYCODE_f) 119 119 _fastMode ^= 1; 120 120 else if (event.kbd.keycode == Common::KEYCODE_g) -
engines/kyra/gui.cpp
421 421 while (_vm->_eventMan->pollEvent(event) && running) { 422 422 switch (event.type) { 423 423 case Common::EVENT_KEYDOWN: 424 if (event.kbd.keycode == Common::KEYCODE_q && event.kbd. flags == Common::KBD_CTRL)424 if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL)) 425 425 _vm->quitGame(); 426 426 else 427 427 _keyPressed = event.kbd; -
engines/kyra/kyra_v1.cpp
262 262 switch (event.type) { 263 263 case Common::EVENT_KEYDOWN: 264 264 if (event.kbd.keycode >= Common::KEYCODE_1 && event.kbd.keycode <= Common::KEYCODE_9 && 265 (event.kbd. flags == Common::KBD_CTRL || event.kbd.flags == Common::KBD_ALT) && mainLoop) {265 (event.kbd.hasFlags(Common::KBD_CTRL) || event.kbd.hasFlags(Common::KBD_ALT)) && mainLoop) { 266 266 int saveLoadSlot = 9 - (event.kbd.keycode - Common::KEYCODE_0) + 990; 267 267 268 if (event.kbd. flags == Common::KBD_CTRL) {268 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 269 269 loadGameStateCheck(saveLoadSlot); 270 270 _eventList.clear(); 271 271 breakLoop = true; … … 274 274 sprintf(savegameName, "Quicksave %d", event.kbd.keycode - Common::KEYCODE_0); 275 275 saveGameState(saveLoadSlot, savegameName, 0); 276 276 } 277 } else if (event.kbd. flags == Common::KBD_CTRL) {277 } else if (event.kbd.hasFlags(Common::KBD_CTRL)) { 278 278 if (event.kbd.keycode == Common::KEYCODE_d) { 279 279 if (_debugger) 280 280 _debugger->attach(); … … 384 384 event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT || 385 385 event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT) 386 386 _eventList.push_back(Event(event, true)); 387 else if (event.kbd.keycode == Common::KEYCODE_q && event.kbd. flags == Common::KBD_CTRL)387 else if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL)) 388 388 quitGame(); 389 389 else 390 390 _eventList.push_back(event); -
engines/lure/fights.cpp
205 205 return; 206 206 207 207 case Common::KEYCODE_d: 208 if (events.event().kbd. flags == Common::KBD_CTRL) {208 if (events.event().kbd.hasFlags(Common::KBD_CTRL)) { 209 209 // Activate the debugger 210 210 game.debugger().attach(); 211 211 return; -
engines/lure/game.cpp
195 195 if (events.type() == Common::EVENT_KEYDOWN) { 196 196 uint16 roomNum = room.roomNumber(); 197 197 198 if ((events.event().kbd. flags == Common::KBD_CTRL) &&198 if ((events.event().kbd.hasFlags(Common::KBD_CTRL)) && 199 199 (events.event().kbd.keycode == Common::KEYCODE_d)) { 200 200 // Activate the debugger 201 201 _debugger->attach(); -
engines/m4/events.cpp
73 73 if ((_event.kbd.keycode == Common::KEYCODE_LCTRL) || (_event.kbd.keycode == Common::KEYCODE_RCTRL)) 74 74 _ctrlFlag = true; 75 75 76 else if (_event.kbd. flags == Common::KBD_CTRL) {76 else if (_event.kbd.hasFlags(Common::KBD_CTRL)) { 77 77 if ((_event.kbd.keycode == Common::KEYCODE_d) && _ctrlFlag) { 78 78 _console->attach(); 79 79 _console->onFrame(); -
engines/m4/mads_views.cpp
362 362 363 363 // Capitalise the letter if necessary 364 364 if (_cheatKeyCtr < CHEAT_SEQUENCE_MAX) { 365 if ((flags ==Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) {365 if ((flags & Common::KBD_CTRL) && (kc == CHEAT_SEQUENCE[_cheatKeyCtr])) { 366 366 ++_cheatKeyCtr; 367 367 if (_cheatKeyCtr == CHEAT_SEQUENCE_MAX) 368 368 Dialog::display(_vm, 22, cheatingEnabledDesc); -
engines/parallaction/input.cpp
111 111 _hasKeyPressEvent = true; 112 112 _keyPressed = e.kbd; 113 113 114 if (e.kbd. flags == Common::KBD_CTRL && e.kbd.keycode == 'd')114 if (e.kbd.hasFlags(Common::KBD_CTRL) && e.kbd.keycode == Common::KEYCODE_d) 115 115 _vm->_debugger->attach(); 116 116 117 117 updateMousePos = false; -
engines/queen/input.cpp
100 100 _idleTime = 0; 101 101 switch (event.type) { 102 102 case Common::EVENT_KEYDOWN: 103 if (event.kbd. flags == Common::KBD_CTRL) {104 if (event.kbd.keycode == 'd') {103 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 104 if (event.kbd.keycode == Common::KEYCODE_d) { 105 105 _debugger = true; 106 } else if (event.kbd.keycode == 'f') {106 } else if (event.kbd.keycode == Common::KEYCODE_f) { 107 107 _fastMode = !_fastMode; 108 108 } 109 109 } else { -
engines/saga/input.cpp
44 44 while (_eventMan->pollEvent(event)) { 45 45 switch (event.type) { 46 46 case Common::EVENT_KEYDOWN: 47 if (event.kbd. flags == Common::KBD_CTRL) {47 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 48 48 if (event.kbd.keycode == Common::KEYCODE_d) 49 49 _console->attach(); 50 50 } … … 56 56 switch (event.kbd.keycode) { 57 57 case Common::KEYCODE_HASH: 58 58 case Common::KEYCODE_BACKQUOTE: 59 case Common::KEYCODE_ QUOTE: // tilde ("~")59 case Common::KEYCODE_TILDE: // tilde ("~") 60 60 _console->attach(); 61 61 break; 62 62 case Common::KEYCODE_r: -
engines/saga/interface.cpp
651 651 return true; 652 652 } 653 653 } 654 if (keystate.keycode == Common::KEYCODE_o && keystate. flags == Common::KBD_CTRL) { // ctrl-o654 if (keystate.keycode == Common::KEYCODE_o && keystate.hasFlags(Common::KBD_CTRL)) { // ctrl-o 655 655 if (_saveReminderState > 0) { 656 656 setMode(kPanelOption); 657 657 return true; -
engines/scumm/dialogs.cpp
725 725 } 726 726 727 727 void SubtitleSettingsDialog::handleKeyDown(Common::KeyState state) { 728 if (state.keycode == 't' && state.flags == Common::KBD_CTRL) {728 if (state.keycode == Common::KEYCODE_t && state.hasFlags(Common::KBD_CTRL)) { 729 729 cycleValue(); 730 730 731 731 reflowLayout(); -
engines/scumm/input.cpp
110 110 void ScummEngine::parseEvent(Common::Event event) { 111 111 switch (event.type) { 112 112 case Common::EVENT_KEYDOWN: 113 if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9'&&114 ((event.kbd. flags == Common::KBD_ALT&& canSaveGameStateCurrently()) ||115 (event.kbd. flags == Common::KBD_CTRL&& canLoadGameStateCurrently()))) {116 _saveLoadSlot = event.kbd.keycode - '0';113 if (event.kbd.keycode >= Common::KEYCODE_0 && event.kbd.keycode <= Common::KEYCODE_9 && 114 ((event.kbd.hasFlags(Common::KBD_ALT) && canSaveGameStateCurrently()) || 115 (event.kbd.hasFlags(Common::KBD_CTRL) && canLoadGameStateCurrently()))) { 116 _saveLoadSlot = event.kbd.keycode - Common::KEYCODE_0; 117 117 118 118 // don't overwrite autosave (slot 0) 119 119 if (_saveLoadSlot == 0) 120 120 _saveLoadSlot = 10; 121 121 122 122 sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot); 123 _saveLoadFlag = (event.kbd. flags == Common::KBD_ALT) ? 1 : 2;123 _saveLoadFlag = (event.kbd.hasFlags(Common::KBD_ALT)) ? 1 : 2; 124 124 _saveTemporaryState = false; 125 } else if (event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 'f') {125 } else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_f) { 126 126 _fastMode ^= 1; 127 } else if (event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 'g') {127 } else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_g) { 128 128 _fastMode ^= 2; 129 } else if ((event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 'd') ||130 129 } else if ((event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_d) 130 || event.kbd.ascii == '~' || event.kbd.ascii == '#') { 131 131 _debugger->attach(); 132 } else if (event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 's') {132 } else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_s) { 133 133 _res->resourceStats(); 134 134 } else { 135 135 // Normal key press, pass on to the game. … … 355 355 #ifdef ENABLE_SCUMM_7_8 356 356 void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) { 357 357 // F1 (the trigger for the original save/load dialog) is mapped to F5 358 if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit. flags == 0) {358 if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit.hasFlags(0)) { 359 359 lastKeyHit = Common::KeyState(Common::KEYCODE_F5, 319); 360 360 } 361 361 362 362 // Alt-F5 should bring up the original save/load dialog, so map it to F1. 363 if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit. flags == Common::KBD_ALT) {363 if (!(_game.features & GF_DEMO) && lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.hasFlags(Common::KBD_ALT)) { 364 364 lastKeyHit = Common::KeyState(Common::KEYCODE_F1, 315); 365 365 } 366 366 … … 383 383 // version string is hard coded in the engine, hence we don't invoke 384 384 // versionDialog for it. Dig/FT version strings are partly hard coded, too. 385 385 if (_game.id != GID_CMI && 0 != VAR(VAR_VERSION_KEY) && 386 lastKeyHit.keycode == Common::KEYCODE_v && lastKeyHit. flags == Common::KBD_CTRL) {386 lastKeyHit.keycode == Common::KEYCODE_v && lastKeyHit.hasFlags(Common::KBD_CTRL)) { 387 387 versionDialog(); 388 388 389 389 } else if (cutsceneExitKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_ESCAPE) { … … 408 408 #endif 409 409 410 410 void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) { 411 if (lastKeyHit.keycode == Common::KEYCODE_t && lastKeyHit. flags == Common::KBD_CTRL) {411 if (lastKeyHit.keycode == Common::KEYCODE_t && lastKeyHit.hasFlags(Common::KBD_CTRL)) { 412 412 SubtitleSettingsDialog dialog(this, _voiceMode); 413 413 _voiceMode = runDialog(dialog); 414 414 … … 442 442 ScummEngine::processKeyboard(lastKeyHit); 443 443 444 444 // On Alt-F5 prepare savegame for the original save/load dialog. 445 if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit. flags == Common::KBD_ALT) {445 if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.hasFlags(Common::KBD_ALT)) { 446 446 prepareSavegame(); 447 447 if (_game.id == GID_MANIAC && _game.version == 0) { 448 448 runScript(2, 0, 0, 0); … … 467 467 ScummEngine::processKeyboard(lastKeyHit); 468 468 469 469 // On Alt-F5 prepare savegame for the original save/load dialog. 470 if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit. flags == Common::KBD_ALT) {470 if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.hasFlags(Common::KBD_ALT)) { 471 471 prepareSavegame(); 472 472 } 473 473 … … 504 504 if (_game.id == GID_CMI) 505 505 mainmenuKeyEnabled = true; 506 506 507 if (mainmenuKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit. flags == 0)) {507 if (mainmenuKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.hasFlags(0))) { 508 508 if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0) 509 509 runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0); 510 510 … … 513 513 if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0) 514 514 runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0); 515 515 516 } else if (restartKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F8 && lastKeyHit. flags == 0)) {516 } else if (restartKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F8 && lastKeyHit.hasFlags(0))) { 517 517 confirmRestartDialog(); 518 518 519 } else if (pauseKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_SPACE && lastKeyHit. flags == 0)) {519 } else if (pauseKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_SPACE && lastKeyHit.hasFlags(0))) { 520 520 pauseGame(); 521 521 522 } else if (talkstopKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_PERIOD && lastKeyHit. flags == 0)) {522 } else if (talkstopKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_PERIOD && lastKeyHit.hasFlags(0))) { 523 523 _talkDelay = 0; 524 524 if (_sound->_sfxMode & 2) 525 525 stopTalk(); 526 526 527 } else if (cutsceneExitKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_ESCAPE && lastKeyHit. flags == 0)) {527 } else if (cutsceneExitKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_ESCAPE && lastKeyHit.hasFlags(0))) { 528 528 abortCutscene(); 529 529 530 530 // VAR_CUTSCENEEXIT_KEY doesn't exist in SCUMM0 531 531 if (VAR_CUTSCENEEXIT_KEY != 0xFF) 532 532 _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY); 533 533 } else if (snapScrollKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_r && 534 lastKeyHit. flags == Common::KBD_CTRL) {534 lastKeyHit.hasFlags(Common::KBD_CTRL)) { 535 535 _snapScroll ^= 1; 536 536 if (_snapScroll) { 537 537 messageDialog("Snap scroll on"); -
engines/sky/sky.cpp
113 113 _skySound->fnUnPauseFx(); 114 114 _systemVars.paused = false; 115 115 _skyScreen->setPaletteEndian((uint8 *)_skyCompact->fetchCpt(SkyEngine::_systemVars.currentPalette)); 116 } else if (_keyPressed. flags == Common::KBD_CTRL) {117 if (_keyPressed.keycode == 'f')116 } else if (_keyPressed.hasFlags(Common::KBD_CTRL)) { 117 if (_keyPressed.keycode == Common::KEYCODE_f) 118 118 _fastMode ^= 1; 119 else if (_keyPressed.keycode == 'g')119 else if (_keyPressed.keycode == Common::KEYCODE_g) 120 120 _fastMode ^= 2; 121 else if (_keyPressed.keycode == 'd')121 else if (_keyPressed.keycode == Common::KEYCODE_d) 122 122 _debugger->attach(); 123 123 } else if (_keyPressed.keycode) { 124 124 switch (_keyPressed.keycode) { -
engines/sword2/sword2.cpp
491 491 KeyboardEvent *ke = keyboardEvent(); 492 492 493 493 if (ke) { 494 if ((ke->kbd. flags == Common::KBD_CTRL&& ke->kbd.keycode == Common::KEYCODE_d) || ke->kbd.ascii == '#' || ke->kbd.ascii == '~') {494 if ((ke->kbd.hasFlags(Common::KBD_CTRL) && ke->kbd.keycode == Common::KEYCODE_d) || ke->kbd.ascii == '#' || ke->kbd.ascii == '~') { 495 495 _debugger->attach(); 496 } else if (ke->kbd. flags == 0 || ke->kbd.flags == Common::KBD_SHIFT) {496 } else if (ke->kbd.hasFlags(0) || ke->kbd.hasFlags(Common::KBD_SHIFT)) { 497 497 switch (ke->kbd.keycode) { 498 498 case Common::KEYCODE_p: 499 499 if (_gamePaused) … … 654 654 while (_eventMan->pollEvent(event)) { 655 655 switch (event.type) { 656 656 case Common::EVENT_KEYDOWN: 657 if (event.kbd. flags == Common::KBD_CTRL) {658 if (event.kbd.keycode == 'f') {657 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 658 if (event.kbd.keycode == Common::KEYCODE_f) { 659 659 if (_gameSpeed == 1) 660 660 _gameSpeed = 2; 661 661 else -
engines/teenagent/teenagent.cpp
474 474 //debug(0, "event"); 475 475 switch (event.type) { 476 476 case Common::EVENT_KEYDOWN: 477 if ((event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 'd') ||477 if ((event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_d) || 478 478 event.kbd.ascii == '~' || event.kbd.ascii == '#') { 479 479 console->attach(); 480 } else if (event.kbd. flags == 0&& event.kbd.keycode == Common::KEYCODE_F5) {480 } else if (event.kbd.hasFlags(0) && event.kbd.keycode == Common::KEYCODE_F5) { 481 481 openMainMenuDialog(); 482 } if (event.kbd. flags == Common::KBD_CTRL && event.kbd.keycode == 'f') {482 } if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_f) { 483 483 _mark_delay = _mark_delay == 80? 40: 80; 484 484 debug(0, "mark_delay = %u", _mark_delay); 485 485 } -
engines/tinsel/tinsel.cpp
230 230 continue; 231 231 case Common::KEYCODE_m: 232 232 // Debug facility - scene hopper 233 if (TinselV2 && (evt.kbd. flags == Common::KBD_ALT))233 if (TinselV2 && (evt.kbd.hasFlags(Common::KBD_ALT))) 234 234 ProcessKeyEvent(PLR_JUMP); 235 235 break; 236 236 case Common::KEYCODE_q: 237 if ((evt.kbd. flags == Common::KBD_CTRL) || (evt.kbd.flags == Common::KBD_ALT))237 if ((evt.kbd.hasFlags(Common::KBD_CTRL)) || (evt.kbd.hasFlags(Common::KBD_ALT))) 238 238 ProcessKeyEvent(PLR_QUIT); 239 239 continue; 240 240 case Common::KEYCODE_PAGEUP: … … 1201 1201 // Handle any special keys immediately 1202 1202 switch (event.kbd.keycode) { 1203 1203 case Common::KEYCODE_d: 1204 if ((event.kbd.flags == Common::KBD_CTRL) && (event.type == Common::EVENT_KEYDOWN)) { 1204 // Checks for CTRL flag, ignoring all the sticky flags 1205 if ((Common::KBD_CTRL == (event.kbd.flags & ~(Common::KBD_NUM|Common::KBD_CAPS|Common::KBD_SCRL))) && (event.type == Common::EVENT_KEYDOWN)) { 1205 1206 // Activate the debugger 1206 1207 assert(_console); 1207 1208 _console->attach(); -
engines/touche/touche.cpp
313 313 } else if (event.kbd.keycode == Common::KEYCODE_F10) { 314 314 _fastWalkMode = false; 315 315 } 316 if (event.kbd. flags == Common::KBD_CTRL) {316 if (event.kbd.hasFlags(Common::KBD_CTRL)) { 317 317 if (event.kbd.keycode == Common::KEYCODE_f) { 318 318 _fastMode = !_fastMode; 319 319 } -
engines/tucker/tucker.cpp
607 607 case Common::EVENT_KEYDOWN: 608 608 switch (ev.kbd.keycode) { 609 609 case Common::KEYCODE_f: 610 if (ev.kbd. flags == Common::KBD_CTRL) {610 if (ev.kbd.hasFlags(Common::KBD_CTRL)) { 611 611 _fastMode = !_fastMode; 612 612 } 613 613 break;