[Scummvm-cvs-logs] SF.net SVN: scummvm: [29945] scummvm/trunk/engines/saga/actor_walk.cpp

[lordhoto at users.sourceforge.net]

Revision: 29945
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29945&view=rev
Author:   lordhoto
Date:     2007-12-21 12:45:25 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/actor_walk.cpp

Modified: scummvm/trunk/engines/saga/actor_walk.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor_walk.cpp	2007-12-21 18:36:40 UTC (rev 29944)
+++ scummvm/trunk/engines/saga/actor_walk.cpp	2007-12-21 20:45:25 UTC (rev 29945)
@@ -422,7 +422,7 @@
 				}
 
 				if (ABS(delta.v()) > ABS(delta.u())) {
-					addDelta.v() = CLIP((int) delta.v(), -speed, speed);
+					addDelta.v() = CLIP<int>(delta.v(), -speed, speed);
 					if (addDelta.v() == delta.v()) {
 						addDelta.u() = delta.u();
 					} else {
@@ -431,7 +431,7 @@
 						addDelta.u() /= delta.v();
 					}
 				} else {
-					addDelta.u() = CLIP((int) delta.u(), -speed, speed);
+					addDelta.u() = CLIP<int>(delta.u(), -speed, speed);
 					if (addDelta.u() == delta.u()) {
 						addDelta.v() = delta.v();
 					} else {
@@ -484,7 +484,7 @@
 					speed = speed / 2;
 
 				if ((actor->_actionDirection == kDirUp) || (actor->_actionDirection == kDirDown)) {
-					addDelta.y = CLIP((int) delta.y, -speed, speed);
+					addDelta.y = CLIP<int>(delta.y, -speed, speed);
 					if (addDelta.y == delta.y) {
 						addDelta.x = delta.x;
 					} else {
@@ -494,7 +494,7 @@
 						actor->_facingDirection = actor->_actionDirection;
 					}
 				} else {
-					addDelta.x = CLIP((int) delta.x, -2 * speed, 2 * speed);
+					addDelta.x = CLIP<int>(delta.x, -2 * speed, 2 * speed);
 					if (addDelta.x == delta.x) {
 						addDelta.y = delta.y;
 					} else {
@@ -855,7 +855,7 @@
 					newLocation.y += _vm->_rnd.getRandomNumber(prefer1.y - 1) - prefer1.y / 2;
 				}
 
-				newLocation.x = CLIP((int) newLocation.x, -31 * 4, (_vm->getDisplayWidth() + 31) * 4);
+				newLocation.x = CLIP<int>(newLocation.x, -31 * 4, (_vm->getDisplayWidth() + 31) * 4);
 
 				return actorWalkTo(actor->_id, newLocation);
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.