From d176a6a6e1b807c0f6c5ae100fd2ed0977210dd3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 31 Dec 2003 15:52:48 +0000
Subject: Don't lose the luggage when entering the inventory menu.

svn-id: r12058
---
 sword1/menu.cpp  | 6 +-----
 sword1/mouse.cpp | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'sword1')

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?
-- 
cgit v1.2.3