diff options
Diffstat (limited to 'engines/pegasus/neighborhood')
-rwxr-xr-x | engines/pegasus/neighborhood/caldoria/caldoria.cpp | 2 | ||||
-rw-r--r-- | engines/pegasus/neighborhood/neighborhood.cpp | 6 | ||||
-rwxr-xr-x | engines/pegasus/neighborhood/tsa/fulltsa.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp index a4beecde9b..484242371a 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp @@ -222,7 +222,7 @@ void Caldoria::start() { } } - InputHandler::getCurrentInputDevice()->getInput(input, kPullbackInterruptFilter); + InputDevice.getInput(input, kPullbackInterruptFilter); if (input.anyInput()) { // TODO: Save/Quit requests skipped = true; break; diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp index b516989e4d..224d954eca 100644 --- a/engines/pegasus/neighborhood/neighborhood.cpp +++ b/engines/pegasus/neighborhood/neighborhood.cpp @@ -882,7 +882,7 @@ void Neighborhood::startExtraSequence(const ExtraID extraID, const NotificationF } bool Neighborhood::startExtraSequenceSync(const ExtraID extraID, const InputBits interruptionFilter) { - InputHandler::getCurrentInputDevice()->waitInput(interruptionFilter); + InputDevice.waitInput(interruptionFilter); return prepareExtraSync(extraID) && waitMovieFinish(&_navMovie, interruptionFilter); } @@ -1315,7 +1315,7 @@ bool Neighborhood::waitMovieFinish(Movie *movie, const InputBits interruptionFil bool openAllowed = _vm->swapLoadAllowed(false); while (movie->isRunning()) { - InputHandler::getCurrentInputDevice()->getInput(input, interruptionFilter); + InputDevice.getInput(input, interruptionFilter); if (input.anyInput() || _vm->shouldQuit()) { result = false; @@ -1590,7 +1590,7 @@ void Neighborhood::playCroppedMovieOnce(const Common::String &movieName, CoordTy Input input; while (_croppedMovie.isRunning() && !_vm->shouldQuit()) { _vm->processShell(); - InputHandler::getCurrentInputDevice()->getInput(input, interruptionFilter); + InputDevice.getInput(input, interruptionFilter); if (input.anyInput() || _vm->shouldQuit()) // TODO: Save/Load request break; _vm->_system->delayMillis(10); diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp index c54e252a64..7f5c3925d1 100755 --- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp +++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp @@ -1619,7 +1619,7 @@ void FullTSA::showMainJumpMenu() { } void FullTSA::playTBPMonitor() { - InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons); + InputDevice.waitInput(kFilterAllButtons); if ((GameState.getT0BMonitorMode() & kPlayingTBPMask) == 0) { ExtraID extra; @@ -1770,7 +1770,7 @@ void FullTSA::initializeComparisonMonitor(const int newMode, const ExtraID compa } void FullTSA::playLeftComparison() { - InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons); + InputDevice.waitInput(kFilterAllButtons); if ((GameState.getT0BMonitorMode() & kPlayingLeftComparisonMask) == 0) { ExtraID extra; @@ -1820,7 +1820,7 @@ void FullTSA::playLeftComparison() { } void FullTSA::playRightComparison() { - InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons); + InputDevice.waitInput(kFilterAllButtons); if ((GameState.getT0BMonitorMode() & kPlayingRightComparisonMask) == 0) { ExtraID extra; |