aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2008-03-19 10:17:29 +0000
committerMax Horn2008-03-19 10:17:29 +0000
commit98a851d25edf8e3b463e3c8114959fe1edc32a48 (patch)
tree48f6ba96caab68eb6f30f7d425367317c410b963 /engines/scumm
parent2d33f965a57b7364e47b5f39baabc13a54303446 (diff)
downloadscummvm-rg350-98a851d25edf8e3b463e3c8114959fe1edc32a48.tar.gz
scummvm-rg350-98a851d25edf8e3b463e3c8114959fe1edc32a48.tar.bz2
scummvm-rg350-98a851d25edf8e3b463e3c8114959fe1edc32a48.zip
cleanup
svn-id: r31192
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/object.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index c39c9b1d5a..b512c83b94 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -155,7 +155,6 @@ void ScummEngine::setOwnerOf(int obj, int owner) {
void ScummEngine::clearOwnerOf(int obj) {
int i;
- uint16 *a;
// Stop the associated object script code (else crashes might occurs)
stopObjectScript(obj);
@@ -182,8 +181,7 @@ void ScummEngine::clearOwnerOf(int obj) {
_inventory[i] = 0;
// Now fill up the gap removing the object from the inventory created.
- a = _inventory;
- for (i = 0; i < _numInventory - 1; i++, a++) {
+ for (i = 0; i < _numInventory - 1; i++) {
if (!_inventory[i] && _inventory[i+1]) {
_inventory[i] = _inventory[i+1];
_inventory[i+1] = 0;