libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
svn-id: r29945
This commit is contained in:
Johannes Schickel 2007-12-21 20:45:25 +00:00
parent 764dc65101
commit f483d7ce26
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/saga/actor_walk.cpp
View File

@ -422,7 +422,7 @@ void Actor::handleActions(int msec, bool setup) {
}
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ void Actor::handleActions(int msec, bool setup) {
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 @@ bool Actor::followProtagonist(ActorData *actor) {
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);
}