[Scummvm-cvs-logs] CVS: scummvm/sword1 menu.cpp,1.13,1.14 mouse.cpp,1.16,1.17

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Dec 31 07:53:04 CET 2003


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv9761

Modified Files:
	menu.cpp mouse.cpp 
Log Message:
Don't lose the luggage when entering the inventory menu.


Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- menu.cpp	30 Dec 2003 21:48:10 -0000	1.13
+++ menu.cpp	31 Dec 2003 15:52:48 -0000	1.14
@@ -299,17 +299,13 @@
 	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) {

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mouse.cpp	31 Dec 2003 15:41:17 -0000	1.16
+++ mouse.cpp	31 Dec 2003 15:52:48 -0000	1.17
@@ -102,8 +102,10 @@
 
 	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?





More information about the Scummvm-git-logs mailing list