aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Millstone2007-12-21 18:29:47 +0000
committerNeil Millstone2007-12-21 18:29:47 +0000
commitb4a661632ec1437a1fb0a559c54d58f412035c58 (patch)
tree74c08a085131420a2d84b05a64a69489186af818
parentdf33fdd79ed64def3409be869a845dcf069c8d0b (diff)
downloadscummvm-rg350-b4a661632ec1437a1fb0a559c54d58f412035c58.tar.gz
scummvm-rg350-b4a661632ec1437a1fb0a559c54d58f412035c58.tar.bz2
scummvm-rg350-b4a661632ec1437a1fb0a559c54d58f412035c58.zip
Fix compilation error on DS port (template expects parameters to be same type)
svn-id: r29941
-rw-r--r--engines/saga/actor_walk.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/saga/actor_walk.cpp b/engines/saga/actor_walk.cpp
index 4c23d4bf93..7f165188f2 100644
--- a/engines/saga/actor_walk.cpp
+++ b/engines/saga/actor_walk.cpp
@@ -422,7 +422,7 @@ void Actor::handleActions(int msec, bool setup) {
}
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ bool Actor::followProtagonist(ActorData *actor) {
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);
}