[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.73,1.74

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31034

Modified Files:
	object.cpp 
Log Message:
act->obj - we are dealing with objects not actors after all

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- object.cpp	25 Jun 2002 02:04:43 -0000	1.73
+++ object.cpp	2 Jul 2002 21:29:24 -0000	1.74
@@ -70,27 +70,27 @@
 	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)