From ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 25 May 2005 09:17:35 +0000
Subject: abs -> ABS (code unification)

svn-id: r18246
---
 scumm/camera.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scumm/camera.cpp')

diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 42e11c72b0..80b95fd74b 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -37,7 +37,7 @@ void ScummEngine::setCameraAtEx(int at) {
 }
 
 void ScummEngine::setCameraAt(int pos_x, int pos_y) {
-	if (camera._mode != kFollowActorCameraMode || abs(pos_x - camera._cur.x) > (_screenWidth / 2)) {
+	if (camera._mode != kFollowActorCameraMode || ABS(pos_x - camera._cur.x) > (_screenWidth / 2)) {
 		camera._cur.x = pos_x;
 	}
 	camera._dest.x = pos_x;
@@ -261,8 +261,8 @@ void ScummEngine_v7::setCameraFollows(Actor *a) {
 		startScene(a->getRoom(), 0, 0);
 	}
 
-	ax = abs(a->_pos.x - camera._cur.x);
-	ay = abs(a->_pos.y - camera._cur.y);
+	ax = ABS(a->_pos.x - camera._cur.x);
+	ay = ABS(a->_pos.y - camera._cur.y);
 
 	if (ax > VAR(VAR_CAMERA_THRESHOLD_X) || ay > VAR(VAR_CAMERA_THRESHOLD_Y) || ax > (_screenWidth / 2) || ay > (_screenHeight / 2)) {
 		setCameraAt(a->_pos.x, a->_pos.y);
@@ -278,8 +278,8 @@ void ScummEngine_v7::moveCamera() {
 
 	if (camera._follows) {
 		a = derefActor(camera._follows, "moveCamera");
-		if (abs(camera._cur.x - a->_pos.x) > VAR(VAR_CAMERA_THRESHOLD_X) ||
-				abs(camera._cur.y - a->_pos.y) > VAR(VAR_CAMERA_THRESHOLD_Y)) {
+		if (ABS(camera._cur.x - a->_pos.x) > VAR(VAR_CAMERA_THRESHOLD_X) ||
+				ABS(camera._cur.y - a->_pos.y) > VAR(VAR_CAMERA_THRESHOLD_Y)) {
 			camera._movingToActor = true;
 			if (VAR(VAR_CAMERA_THRESHOLD_X) == 0)
 				camera._cur.x = a->_pos.x;
-- 
cgit v1.2.3