thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The options panel in IHNM is now shown and functioning correctly when it's opened during a character's speech

Browse source 
svn-id: r29266
This commit is contained in:
Filippos Karapetis 2007-10-27 17:55:50 +00:00
parent 102764da6e
commit 01e88f1fbf
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/saga/interface.cpp
View file

@ -1623,9 +1623,19 @@ void Interface::update(const Point& mousePoint, int updateFlag) {
// When opening the psychic profile, or the options screen in the non-interactive part of the IHNM demo, // 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) // the interface is locked (_active is false)
// Don't return in those cases, so that mouse actions can be processed // Don't return in those cases, so that mouse actions can be processed
if (!(_vm->getGameType() == GType_IHNM && _panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)) && if (_vm->getGameType() == GType_ITE) {
!(_vm->getGameId() == GID_IHNM_DEMO && (_panelMode == kPanelOption || _panelMode == kPanelQuit)))
return; return;
} else {
if (_panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)) {
// the psychic profile or the special screen in IHNM demo is open, don't return
} else if (_panelMode == kPanelOption || _panelMode == kPanelQuit) {
// options/quit panel is open, set interface to active and don't return
_vm->_actor->abortSpeech(); // abort any speech being played
_active = true;
} else {
return;
}
}
} }
if (_statusTextInput) { if (_statusTextInput) {