HUGO: refactoring: move boundaries to object class

svn-id: r55879

1 files changed, 9 insertions, 9 deletions

diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp
index f2cac5c658..64def1435a 100644
--- a/engines/hugo/object_v1d.cpp
+++ b/engines/hugo/object_v1d.cpp
@@ -224,7 +224,7 @@ void ObjectHandler_v1d::moveObjects() {
 						obj->cycling = kCycleForward;
 				} else {
 					obj->cycling = kCycleNotCycling;
-					_vm->boundaryCollision(obj);    // Must have got hero!
+					boundaryCollision(obj);         // Must have got hero!
 				}
 				obj->oldvx = obj->vx;
 				obj->oldvy = obj->vy;
@@ -267,7 +267,7 @@ void ObjectHandler_v1d::moveObjects() {
 			}
 			// Store boundaries
 			if ((obj->cycling > kCycleAlmostInvisible) && (obj->priority == kPriorityFloating))
-				_vm->storeBoundary(obj->x + currImage->x1, obj->x + currImage->x2, obj->y + currImage->y2);
+				storeBoundary(obj->x + currImage->x1, obj->x + currImage->x2, obj->y + currImage->y2);
 		}
 	}
 
@@ -287,25 +287,25 @@ void ObjectHandler_v1d::moveObjects() {
 			int y2 = obj->y + currImage->y2;        // Bottom edge
 
 			if ((obj->cycling > kCycleAlmostInvisible) && (obj->priority == kPriorityFloating))
-				_vm->clearBoundary(x1, x2, y2);     // Clear our own boundary
+				clearBoundary(x1, x2, y2);     // Clear our own boundary
 
 			// Allowable motion wrt boundary
-			int dx = _vm->deltaX(x1, x2, obj->vx, y2);
+			int dx = deltaX(x1, x2, obj->vx, y2);
 			if (dx != obj->vx) {
 				// An object boundary collision!
-				_vm->boundaryCollision(obj);
+				boundaryCollision(obj);
 				obj->vx = 0;
 			}
 
-			int dy = _vm->deltaY(x1, x2, obj->vy, y2);
+			int dy = deltaY(x1, x2, obj->vy, y2);
 			if (dy != obj->vy) {
 				// An object boundary collision!
-				_vm->boundaryCollision(obj);
+				boundaryCollision(obj);
 				obj->vy = 0;
 			}
 
 			if ((obj->cycling > kCycleAlmostInvisible) && (obj->priority == kPriorityFloating))
-				_vm->storeBoundary(x1, x2, y2);     // Re-store our own boundary
+				storeBoundary(x1, x2, y2);     // Re-store our own boundary
 
 			obj->x += dx;                           // Update object position
 			obj->y += dy;
@@ -330,7 +330,7 @@ void ObjectHandler_v1d::moveObjects() {
 		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 > kCycleAlmostInvisible) && (obj->priority == kPriorityFloating))
-			_vm->clearBoundary(obj->oldx + currImage->x1, obj->oldx + currImage->x2, obj->oldy + currImage->y2);
+			clearBoundary(obj->oldx + currImage->x1, obj->oldx + currImage->x2, obj->oldy + currImage->y2);
 	}
 
 	// If maze mode is enabled, do special maze processing