[Scummvm-cvs-logs] CVS: scummvm/sword1 menu.cpp,1.15,1.16

[Robert G?ffringmann]

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

Modified Files:
	menu.cpp 
Log Message:
another change in the clicking checks

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- menu.cpp	1 Jan 2004 18:00:34 -0000	1.15
+++ menu.cpp	2 Jan 2004 02:38:01 -0000	1.16
@@ -130,8 +130,7 @@
 					SwordLogic::_scriptVars[MENU_LOOKING] = 1;
 					SwordLogic::_scriptVars[DEFAULT_ICON_TEXT] = _objectDefs[_menuList[cnt]].textDesc;
 					refreshMenus = true;
-				}
-				if (mouseEvent & BS1L_BUTTON_DOWN) {
+				} else if (mouseEvent & BS1L_BUTTON_DOWN) {
 					if (SwordLogic::_scriptVars[OBJECT_HELD]) {
 						if (SwordLogic::_scriptVars[OBJECT_HELD] == _menuList[cnt]) {
 							_mouse->setLuggage(0, 0);
@@ -139,19 +138,14 @@
 						} else { // the player is clicking another item on this one.
 							   // run its use-script, if there is one
 							SwordLogic::_scriptVars[SECOND_ITEM] = _menuList[cnt];
+							_mouse->setLuggage(0, 0);
 						}
-					} else
+					} else {
 						SwordLogic::_scriptVars[OBJECT_HELD] = _menuList[cnt];
-					refreshMenus = true;
-				} else if (mouseEvent & BS1L_BUTTON_UP) {
-					if (SwordLogic::_scriptVars[OBJECT_HELD] == _menuList[cnt]) {
 						_mouse->setLuggage(_objectDefs[_menuList[cnt]].luggageIconRes, 0);
 						return cnt + 1;
-					} else {
-						_mouse->setLuggage(0, 0);
-						SwordLogic::_scriptVars[OBJECT_HELD] = 0;
-						refreshMenus = true;
 					}
+					refreshMenus = true;
 				}
 		}
 	}