From a0199df818a90fcd142ef7d0adbc3bbda98003ac Mon Sep 17 00:00:00 2001 From: Arnaud Boutonné Date: Thu, 11 Nov 2010 23:04:04 +0000 Subject: HUGO: Cleanup, move several functions and variables to the object class svn-id: r54212 --- engines/hugo/object_v1w.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/hugo/object_v1w.cpp') diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp index 48d921f2be..b47bd0e488 100644 --- a/engines/hugo/object_v1w.cpp +++ b/engines/hugo/object_v1w.cpp @@ -65,7 +65,7 @@ void ObjectHandler_v1w::updateImages() { int num_objs = 0; byte objindex[MAXOBJECTS]; // Array of indeces to objects - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _numObj; i++) { object_t *obj = &_objects[i]; if ((obj->screenIndex == *_vm->_screen_p) && (obj->cycling >= ALMOST_INVISIBLE)) objindex[num_objs++] = i; @@ -183,7 +183,7 @@ void ObjectHandler_v1w::moveObjects() { // Perform any adjustments to velocity based on special path types // and store all (visible) object baselines into the boundary file. // Don't store foreground or background objects - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _numObj; i++) { object_t *obj = &_objects[i]; // Get pointer to object seq_t *currImage = obj->currImagePtr; // Get ptr to current image if (obj->screenIndex == *_vm->_screen_p) { @@ -284,7 +284,7 @@ void ObjectHandler_v1w::moveObjects() { } // Move objects, allowing for boundaries - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _numObj; i++) { object_t *obj = &_objects[i]; // Get pointer to object if ((obj->screenIndex == *_vm->_screen_p) && (obj->vx || obj->vy)) { // Only process if it's moving @@ -338,7 +338,7 @@ void ObjectHandler_v1w::moveObjects() { } // Clear all object baselines from the boundary file. - for (int i = 0; i < _vm->_numObj; i++) { + for (int i = 0; i < _numObj; i++) { object_t *obj = &_objects[i]; // Get pointer to object seq_t *currImage = obj->currImagePtr; // Get ptr to current image if ((obj->screenIndex == *_vm->_screen_p) && (obj->cycling > ALMOST_INVISIBLE) && (obj->priority == FLOATING)) -- cgit v1.2.3