[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.99,1.100 object.cpp,1.152,1.153 script_v6.cpp,1.222,1.223

[Max Horn]

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

Modified Files:
	debugger.cpp object.cpp script_v6.cpp 
Log Message:
_inventory was sometimes accessed one-based and sometimes zero-based -> always use zero-base, for consistency

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- debugger.cpp	25 Dec 2003 18:00:30 -0000	1.99
+++ debugger.cpp	25 Dec 2003 21:56:12 -0000	1.100
@@ -448,7 +448,7 @@
 	}
 
 	if (!strcmp(argv[2], "pickup")) {
-		for (i = 1; i < _vm->_maxInventoryItems; i++) {
+		for (i = 0; i < _vm->_maxInventoryItems; i++) {
 			if (_vm->_inventory[i] == (uint16)obj) {
 				_vm->putOwner(obj, _vm->VAR(_vm->VAR_EGO));
 				_vm->runInventoryScript(obj);

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- object.cpp	21 Dec 2003 13:44:23 -0000	1.152
+++ object.cpp	25 Dec 2003 21:56:12 -0000	1.153
@@ -829,15 +829,15 @@
 		return;
 	}
 
-	for (i = 1; i < _maxInventoryItems; i++) {
+	for (i = 0; i < _maxInventoryItems; i++) {
 		if (_inventory[i] == obj) {
 			j = whereIsObject(obj);
 			if (j == WIO_INVENTORY) {
 				nukeResource(rtInventory, i);
 				_inventory[i] = 0;
 			}
-			a = &_inventory[1];
-			for (i = 1; i < _maxInventoryItems - 1; i++, a++) {
+			a = _inventory;
+			for (i = 0; i < _maxInventoryItems - 1; i++, a++) {
 				if (!a[0] && a[1]) {
 					a[0] = a[1];
 					a[1] = 0;
@@ -1180,7 +1180,7 @@
 
 int ScummEngine::getInventorySlot() {
 	int i;
-	for (i = 1; i <= _maxInventoryItems; i++) {
+	for (i = 0; i < _maxInventoryItems; i++) {
 		if (_inventory[i] == 0)
 			return i;
 	}
@@ -1269,7 +1269,7 @@
 
 int ScummEngine::findInventory(int owner, int idx) {
 	int count = 1, i, obj;
-	for (i = 0; i != _maxInventoryItems; i++) {
+	for (i = 0; i < _maxInventoryItems; i++) {
 		obj = _inventory[i];
 		if (obj && getOwner(obj) == owner && count++ == idx)
 			return obj;
@@ -1280,7 +1280,7 @@
 int ScummEngine::getInventoryCount(int owner) {
 	int i, obj;
 	int count = 0;
-	for (i = 0; i != _maxInventoryItems; i++) {
+	for (i = 0; i < _maxInventoryItems; i++) {
 		obj = _inventory[i];
 		if (obj && getOwner(obj) == owner)
 			count++;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- script_v6.cpp	25 Dec 2003 17:59:10 -0000	1.222
+++ script_v6.cpp	25 Dec 2003 21:56:12 -0000	1.223
@@ -1134,7 +1134,7 @@
 	if (room == 0)
 		room = _roomResource;
 
-	for (i = 1; i < _maxInventoryItems; i++) {
+	for (i = 0; i < _maxInventoryItems; i++) {
 		if (_inventory[i] == (uint16)obj) {
 			putOwner(obj, VAR(VAR_EGO));
 			runInventoryScript(obj);