libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r11925
This commit is contained in:
Max Horn 2003-12-25 21:56:12 +00:00
parent 3d7945e331
commit b5db74b2ac
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/debugger.cpp
View File

@ -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);

12
scumm/object.cpp
View File

@ -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++;

2
scumm/script_v6.cpp
View File

@ -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);