libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When closing inventory, do not force input back to game-mode if commands need otherwise.

Browse Source 
svn-id: r49623
This commit is contained in:
Nicola Mettifogo 2010-06-13 07:35:48 +00:00
parent eff1d4bb1c
commit d199377388
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/parallaction/input.cpp
View File

@ -395,7 +395,7 @@ void Input::exitInventoryMode() {
_vm->dropItem(z->u._mergeObj1);
_vm->dropItem(z->u._mergeObj2);
_vm->addInventoryItem(z->u._mergeObj3);
_vm->_cmdExec->run(z->_commands);
_vm->_cmdExec->run(z->_commands); // commands might set a new _inputMode
}
}
@ -412,7 +412,11 @@ void Input::exitInventoryMode() {
}
_vm->resumeJobs();
_inputMode = kInputModeGame;
// in case the input mode was not changed by the code above (especially by the commands
// executed in case of a merge), then assume we are going back to game mode
if (_inputMode == kInputModeInventory) {
_inputMode = kInputModeGame;
}
}
bool Input::updateInventoryInput() {