[Scummvm-cvs-logs] CVS: scummvm/scumm verbs.cpp,1.60,1.61

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/scumm

Modified Files:
	verbs.cpp 
Log Message:
Fix fix for 769896


Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- verbs.cpp	12 Jul 2003 09:45:10 -0000	1.60
+++ verbs.cpp	12 Jul 2003 10:19:18 -0000	1.61
@@ -27,6 +27,8 @@
 #include "scumm.h"
 #include "verbs.h"
 
+int egoVar;	// TODO: Put this in V2 class?
+
 enum {
 	kInventoryUpArrow = 4,
 	kInventoryDownArrow = 5,
@@ -150,7 +152,6 @@
 
 void Scumm::checkV2Inventory(int x, int y) {
 	int object = 0;
-	static int egoVar;
 
 	y -= virtscr[2].topline;
 
@@ -207,6 +208,11 @@
 		return;
 
 	_string[1].charset = 1;
+
+	if (_scummVars[VAR_EGO] != egoVar) {
+		egoVar = _scummVars[VAR_EGO];
+		_inventoryOffset = 0;
+	}
 
 	max_inv = getInventoryCount(_scummVars[VAR_EGO]) - _inventoryOffset;
 	if (max_inv > 4)