[Scummvm-cvs-logs] scummvm master -> d04667e58a889e4744f36fb5797a69fa437a1abf
clone2727
clone2727 at gmail.com
Thu Feb 27 03:58:36 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d04667e58a PEGASUS: Fix being able to use the inventory from the pause screen
Commit: d04667e58a889e4744f36fb5797a69fa437a1abf
https://github.com/scummvm/scummvm/commit/d04667e58a889e4744f36fb5797a69fa437a1abf
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-02-26T18:57:38-08:00
Commit Message:
PEGASUS: Fix being able to use the inventory from the pause screen
Somehow, I completely missed implementing this function!
Changed paths:
engines/pegasus/pegasus.cpp
engines/pegasus/pegasus.h
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index c45053d..c5edd34 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 59637e3..fb66eb7 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;
More information about the Scummvm-git-logs
mailing list