diff options
| author | Filippos Karapetis | 2007-07-31 00:18:45 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-07-31 00:18:45 +0000 |
| commit | 9a125828b92cae9c1b503731f29ee3712322228f (patch) | |
| tree | be8d778cfaaee6b5743e80197dd4f229fd521190 /engines/saga/interface.cpp | |
| parent | 3ee5ee2c060a4caf847ea15756cab802c9d91db7 (diff) | |
| download | scummvm-rg350-9a125828b92cae9c1b503731f29ee3712322228f.tar.gz scummvm-rg350-9a125828b92cae9c1b503731f29ee3712322228f.tar.bz2 scummvm-rg350-9a125828b92cae9c1b503731f29ee3712322228f.zip | |
The mouse works correctly now in the options dialog when it's opened in the non-interactive part of the IHNM demo
svn-id: r28346
Diffstat (limited to 'engines/saga/interface.cpp')
| -rw-r--r-- | engines/saga/interface.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 19d9db7132..c7054436d9 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -1603,9 +1603,11 @@ void Interface::update(const Point& mousePoint, int updateFlag) { _vm->_actor->abortSpeech(); if (_vm->_scene->isInIntro() || _fadeMode == kFadeOut || !_active) { - // When opening the psychic profile, the interface is locked (_active is false) - // Don't return if the psychic profile is up, so that mouse clicks can be processed - if (!(_vm->getGameType() == GType_IHNM && _panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK))) + // When opening the psychic profile, or the options screen in the non-interactive part of the IHNM demo, + // the interface is locked (_active is false) + // Don't return in those cases, so that mouse actions can be processed + if (!(_vm->getGameType() == GType_IHNM && _panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)) && + !(_vm->getGameId() == GID_IHNM_DEMO && (_panelMode == kPanelOption || _panelMode == kPanelQuit))) return; } |