diff options
| author | Max Horn | 2005-05-25 09:17:35 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-25 09:17:35 +0000 |
| commit | ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b (patch) | |
| tree | 70de3973f7e4a5bca23707861140df7fe8a9c9de /scumm/camera.cpp | |
| parent | 936b3025573c3de041c7365c4f85a515018f3634 (diff) | |
| download | scummvm-rg350-ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b.tar.gz scummvm-rg350-ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b.tar.bz2 scummvm-rg350-ef9d595a907fb1b33a9ca7cdf3e1ba26a5991a1b.zip | |
abs -> ABS (code unification)
svn-id: r18246
Diffstat (limited to 'scumm/camera.cpp')
| -rw-r--r-- | scumm/camera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |