[Scummvm-cvs-logs] SF.net SVN: scummvm: [29941] scummvm/trunk/engines/saga/actor_walk.cpp
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Fri Dec 21 19:29:48 CET 2007
Revision: 29941
http://scummvm.svn.sourceforge.net/scummvm/?rev=29941&view=rev
Author: agent-q
Date: 2007-12-21 10:29:47 -0800 (Fri, 21 Dec 2007)
Log Message:
-----------
Fix compilation error on DS port (template expects parameters to be same type)
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:28:59 UTC (rev 29940)
+++ scummvm/trunk/engines/saga/actor_walk.cpp 2007-12-21 18:29:47 UTC (rev 29941)
@@ -422,7 +422,7 @@
}
if (ABS(delta.v()) > ABS(delta.u())) {
- addDelta.v() = CLIP(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(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(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(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(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.
More information about the Scummvm-git-logs
mailing list