_inventory was sometimes accessed one-based and sometimes zero-based -> always use zero-base, for consistency

svn-id: r11925

3 files changed, 8 insertions, 8 deletions

diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 3cd30c2c5a..25ce18a830 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -448,7 +448,7 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
 	}
 
 	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);
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 69b69b6a65..0d3d610f07 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -829,15 +829,15 @@ void ScummEngine::clearOwnerOf(int obj) {
 		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 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 
 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::getObjNewDir(int obj) {
 
 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::findInventory(int owner, int idx) {
 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++;
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index a81524220d..15eb89e128 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1134,7 +1134,7 @@ void ScummEngine_v6::o6_pickupObject() {
 	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);