diff options
author | Max Horn | 2003-12-25 21:56:12 +0000 |
---|---|---|
committer | Max Horn | 2003-12-25 21:56:12 +0000 |
commit | b5db74b2ac52d6d15ac8a5f2405a49c9310eb83f (patch) | |
tree | b780ca71e1b43539141c4bc85ed8673bf7bbd71e /scumm/object.cpp | |
parent | 3d7945e3314a80ee5be69cbc4740890b6b4b18ca (diff) | |
download | scummvm-rg350-b5db74b2ac52d6d15ac8a5f2405a49c9310eb83f.tar.gz scummvm-rg350-b5db74b2ac52d6d15ac8a5f2405a49c9310eb83f.tar.bz2 scummvm-rg350-b5db74b2ac52d6d15ac8a5f2405a49c9310eb83f.zip |
_inventory was sometimes accessed one-based and sometimes zero-based -> always use zero-base, for consistency
svn-id: r11925
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r-- | scumm/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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++; |