aboutsummaryrefslogtreecommitdiff
path: root/object.cpp
diff options
context:
space:
mode:
authorMax Horn2002-07-02 21:29:24 +0000
committerMax Horn2002-07-02 21:29:24 +0000
commit478c15e7e1ceffdf9fac0d4154b77bd991b0b150 (patch)
treeb8295c6164dc4c2ce3023cdf14c4ce0d01b531a7 /object.cpp
parent01dfd26a3756864dd668bd3cf0bc5c9cb9f3c29a (diff)
downloadscummvm-rg350-478c15e7e1ceffdf9fac0d4154b77bd991b0b150.tar.gz
scummvm-rg350-478c15e7e1ceffdf9fac0d4154b77bd991b0b150.tar.bz2
scummvm-rg350-478c15e7e1ceffdf9fac0d4154b77bd991b0b150.zip
act->obj - we are dealing with objects not actors after all
svn-id: r4452
Diffstat (limited to 'object.cpp')
-rw-r--r--object.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/object.cpp b/object.cpp
index 605c936f9a..4cbac69726 100644
--- a/object.cpp
+++ b/object.cpp
@@ -70,27 +70,27 @@ int Scumm::getOwner(int obj)
return _objectOwnerTable[obj];
}
-void Scumm::putOwner(int act, int owner)
+void Scumm::putOwner(int obj, int owner)
{
- checkRange(_numGlobalObjects - 1, 0, act,
+ checkRange(_numGlobalObjects - 1, 0, obj,
"Object %d out of range in putOwner");
checkRange(0xFF, 0, owner, "Owner %d out of range in putOwner");
- _objectOwnerTable[act] = owner;
+ _objectOwnerTable[obj] = owner;
}
-int Scumm::getState(int act)
+int Scumm::getState(int obj)
{
- checkRange(_numGlobalObjects - 1, 0, act,
+ checkRange(_numGlobalObjects - 1, 0, obj,
"Object %d out of range in getState");
- return _objectStateTable[act];
+ return _objectStateTable[obj];
}
-void Scumm::putState(int act, int state)
+void Scumm::putState(int obj, int state)
{
- checkRange(_numGlobalObjects - 1, 0, act,
+ checkRange(_numGlobalObjects - 1, 0, obj,
"Object %d out of range in putState");
checkRange(0xFF, 0, state, "State %d out of range in putState");
- _objectStateTable[act] = state;
+ _objectStateTable[obj] = state;
}
int Scumm::getObjectRoom(int obj)