diff options
| author | Torbjörn Andersson | 2003-12-31 15:52:48 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-12-31 15:52:48 +0000 |
| commit | d176a6a6e1b807c0f6c5ae100fd2ed0977210dd3 (patch) | |
| tree | bc32a0122585007d3d3dc38f869c0e9153a7e395 /sword1 | |
| parent | 15559f6646cc040a928fc011d7559054ea8492d8 (diff) | |
| download | scummvm-rg350-d176a6a6e1b807c0f6c5ae100fd2ed0977210dd3.tar.gz scummvm-rg350-d176a6a6e1b807c0f6c5ae100fd2ed0977210dd3.tar.bz2 scummvm-rg350-d176a6a6e1b807c0f6c5ae100fd2ed0977210dd3.zip | |
Don't lose the luggage when entering the inventory menu.
svn-id: r12058
Diffstat (limited to 'sword1')
| -rw-r--r-- | sword1/menu.cpp | 6 | ||||
| -rw-r--r-- | sword1/mouse.cpp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sword1/menu.cpp b/sword1/menu.cpp index 6d0b281fa5..451325106d 100644 --- a/sword1/menu.cpp +++ b/sword1/menu.cpp @@ -299,17 +299,13 @@ void SwordMenu::fnStartMenu(void) { SwordLogic::_scriptVars[OBJECT_HELD] = 0; // icon no longer selected SwordLogic::_scriptVars[SECOND_ITEM] = 0; // second icon no longer selected (after using one on another) SwordLogic::_scriptVars[MENU_LOOKING] = 0; // no longer 'looking at' an icon - _mouse->setLuggage(0, 0); buildMenu(); - _mouse->controlPanel(true); // so that the arrow cursor will be shown. showMenu(MENU_TOP); } void SwordMenu::fnEndMenu(void) { - if (_objectBarStatus != MENU_CLOSED) { + if (_objectBarStatus != MENU_CLOSED) _objectBarStatus = MENU_CLOSING; - _mouse->controlPanel(false); - } } void SwordMenu::fnChooser(BsObject *compact) { diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp index 2021fdfbc8..26fd07fde1 100644 --- a/sword1/mouse.cpp +++ b/sword1/mouse.cpp @@ -102,8 +102,10 @@ void SwordMouse::engine(uint16 x, uint16 y, uint16 eventFlags) { if (!SwordLogic::_scriptVars[TOP_MENU_DISABLED]) { if (y < 40) { // okay, we are in the top menu. - if (!_inTopMenu) // are we just entering it? + if (!_inTopMenu) { // are we just entering it? _menu->fnStartMenu(); + setPointer(MSE_POINTER, 0); + } _menu->checkTopMenu(); _inTopMenu = true; } else if (_inTopMenu) { // we're not in the menu. did we just leave it? |