libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed abs() to ABS() in a few places.

Browse Source 
svn-id: r50890
This commit is contained in:
Torbjörn Andersson 2010-07-14 17:02:14 +00:00
parent b91ef12897
commit f98fa72ef3
2 changed files with 6 additions and 6 deletions
engines
draci
walking.cpp
drascula
actors.cpp

4
engines/draci/walking.cpp

@ -324,7 +324,7 @@ void WalkingMap::drawOverlayRectangle(const Common::Point &p, byte colour, byte
}
int WalkingMap::pointsBetween(const Common::Point &p1, const Common::Point &p2) {
return MAX(abs(p2.x - p1.x), abs(p2.y - p1.y));
return MAX(ABS(p2.x - p1.x), ABS(p2.y - p1.y));
}
Common::Point WalkingMap::interpolate(const Common::Point &p1, const Common::Point &p2, int i, int n) {
@ -636,7 +636,7 @@ bool WalkingState::walkOnNextEdge() {
Movement WalkingState::animationForDirection(const Common::Point &here, const Common::Point &there) {
const int dx = there.x - here.x;
const int dy = there.y - here.y;
if (abs(dx) >= abs(dy)) {
if (ABS(dx) >= ABS(dy)) {
return dx >= 0 ? kMoveRight : kMoveLeft;
} else {
return dy >= 0 ? kMoveDown : kMoveUp;

8
engines/drascula/actors.cpp

@ -312,9 +312,9 @@ void DrasculaEngine::quadrant_2() {
float distanceX, distanceY;
if (currentChapter == 2)
distanceX = abs(curX + curWidth - roomX);
distanceX = ABS(curX + curWidth - roomX);
else
distanceX = abs(curX + curWidth / 2 - roomX);
distanceX = ABS(curX + curWidth / 2 - roomX);
distanceY = (curY + curHeight) - roomY;
@ -354,9 +354,9 @@ void DrasculaEngine::quadrant_4() {
float distanceX, distanceY;
if (currentChapter == 2)
distanceX = abs(curX + curWidth - roomX);
distanceX = ABS(curX + curWidth - roomX);
else
distanceX = abs(curX + curWidth / 2 - roomX);
distanceX = ABS(curX + curWidth / 2 - roomX);
distanceY = roomY - (curY + curHeight);