[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.220,1.221

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4042

Modified Files:
	object.cpp 
Log Message:
Patch from Quietust.
Do not let invenotry arrows in MM NES trigger inventory script


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- object.cpp	8 Apr 2005 06:25:57 -0000	1.220
+++ object.cpp	8 Apr 2005 15:14:49 -0000	1.221
@@ -374,7 +374,8 @@
 		} while ((_objs[b].state & mask) == a);
 	}
 	
-	if ((_features & GF_NES) && (v2_mouseover_box != -1))
+	if ((_features & GF_NES) && (_userState & 0x40) && (v2_mouseover_box >= 0) && 
+		(v2_mouseover_box < 4))
 		return findInventory(VAR(VAR_EGO), v2_mouseover_box + _inventoryOffset + 1);
 
 	return 0;