diff options
| author | lukaslw | 2014-06-19 16:38:02 +0200 |
|---|---|---|
| committer | lukaslw | 2014-06-22 20:09:20 +0200 |
| commit | 96a1d24a4ad3416ae3afc7aae19edadeb936b49a (patch) | |
| tree | 9f6b21a99f1005c41904ffa9ed26f02f877ca57e /engines/prince | |
| parent | 1ca309f50ac955c14e7d24328632934fae25b4c8 (diff) | |
| download | scummvm-rg350-96a1d24a4ad3416ae3afc7aae19edadeb936b49a.tar.gz scummvm-rg350-96a1d24a4ad3416ae3afc7aae19edadeb936b49a.tar.bz2 scummvm-rg350-96a1d24a4ad3416ae3afc7aae19edadeb936b49a.zip | |
PRINCE: LMB in inventory - update
Diffstat (limited to 'engines/prince')
| -rw-r--r-- | engines/prince/prince.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index 003b957822..031d827285 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -1694,6 +1694,7 @@ void PrinceEngine::inventoryLeftMouseButton() { return; } } else { + // when this happens? // test bx, RMBMask 7996 ? right mouse button here? - > return; //disable_use if (_currentPointerNumber == 2) { @@ -1701,6 +1702,9 @@ void PrinceEngine::inventoryLeftMouseButton() { changeCursor(1); _currentPointerNumber = 1; //exit_normally + _selectedMob = 0; + _optionsMob = 0; + return; } else { return; } @@ -1726,10 +1730,13 @@ void PrinceEngine::inventoryLeftMouseButton() { printAt(0, 216, _variaTxt->getString(textNr), kNormalWidth / 2, 100); loadVoice(0, 28, Common::String::format("%05d-01.WAV", textNr)); playSample(28, 0); + //exit_normally } else { //store_new_pc // storeNewPC(); - + _flags->setFlagValue(Flags::CURRMOB, _invMobList[_selectedMob - 1]._mask); + //byeinv + _showInventoryFlag = false; } } } else { @@ -1752,9 +1759,8 @@ void PrinceEngine::inventoryLeftMouseButton() { //store_new_pc // storeNewPC(); _flags->setFlagValue(Flags::CURRMOB, _invMobList[_selectedMob - 1]._mask); - _selectedMob = 0; - _optionsMob = 0; //bye_inv + _showInventoryFlag = false; } } else if (_optionEnabled == 1) { // not_examine @@ -1771,9 +1777,8 @@ void PrinceEngine::inventoryLeftMouseButton() { //store_new_pc // storeNewPC(); _flags->setFlagValue(Flags::CURRMOB, _invMobList[_selectedMob - 1]._mask); - _selectedMob = 0; - _optionsMob = 0; //bye_inv + _showInventoryFlag = false; } } else if (_optionEnabled == 4) { // not_use_inv @@ -1795,10 +1800,13 @@ void PrinceEngine::inventoryLeftMouseButton() { printAt(0, 216, _variaTxt->getString(textNr), kNormalWidth / 2, 100); loadVoice(0, 28, Common::String::format("%05d-01.WAV", textNr)); playSample(28, 0); + //exit_normally } else { //store_new_pc // storeNewPC(); - + _flags->setFlagValue(Flags::CURRMOB, _invMobList[_selectedMob - 1]._mask); + //byeinv + _showInventoryFlag = false; } } //exit_normally @@ -2018,6 +2026,10 @@ void PrinceEngine::displayInventory() { } } + if (!_showInventoryFlag) { + break; + } + if (shouldQuit()) return; @@ -2025,6 +2037,12 @@ void PrinceEngine::displayInventory() { _graph->update(_graph->_screenForInventory); pause(); } + + if (_currentPointerNumber == 2) { + _flags->setFlagValue(Flags::SELITEM, _selectedItem); + } else { + _flags->setFlagValue(Flags::SELITEM, 0); + } } void PrinceEngine::createDialogBox(Common::Array<DialogLine> &dialogData) { |