aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2014-02-26 21:56:40 -0500
committerMatthew Hoops2014-02-26 21:57:38 -0500
commitd04667e58a889e4744f36fb5797a69fa437a1abf (patch)
tree3113f1b2813ed1de7dfc4238ef014a25c33ace2c
parent8215f598612a61e472ec56db0f93fb43908a1348 (diff)
downloadscummvm-rg350-d04667e58a889e4744f36fb5797a69fa437a1abf.tar.gz
scummvm-rg350-d04667e58a889e4744f36fb5797a69fa437a1abf.tar.bz2
scummvm-rg350-d04667e58a889e4744f36fb5797a69fa437a1abf.zip
PEGASUS: Fix being able to use the inventory from the pause screen
Somehow, I completely missed implementing this function!
-rw-r--r--engines/pegasus/pegasus.cpp9
-rw-r--r--engines/pegasus/pegasus.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index c45053dfed..c5edd34a01 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -1462,6 +1462,15 @@ void PegasusEngine::throwAwayEverything() {
g_interface = 0;
}
+InputBits PegasusEngine::getInputFilter() {
+ InputBits filter = InputHandler::getInputFilter();
+
+ if (isPaused())
+ return filter & ~JMPPPInput::getItemPanelsInputFilter();
+
+ return filter;
+}
+
void PegasusEngine::processShell() {
checkCallBacks();
checkNotifications();
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
index 59637e38df..fb66eb7586 100644
--- a/engines/pegasus/pegasus.h
+++ b/engines/pegasus/pegasus.h
@@ -272,6 +272,7 @@ private:
uint getNeighborhoodCD(const NeighborhoodID neighborhood) const;
uint _currentCD;
void initKeymap();
+ InputBits getInputFilter();
// Menu
GameMenu *_gameMenu;