diff options
| author | Adrian Frühwirth | 2018-05-07 16:20:34 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-07 19:54:45 +0200 |
| commit | 48406bbd418670b0c39d5cca17f9c84e1ba5f01f (patch) | |
| tree | 9e5b5ccba79011c745359bfc97e7cfa40c97c18f /engines | |
| parent | aabd5b2ec88fcfb9baadfefcf2e4a42ffd8cde20 (diff) | |
| download | scummvm-rg350-48406bbd418670b0c39d5cca17f9c84e1ba5f01f.tar.gz scummvm-rg350-48406bbd418670b0c39d5cca17f9c84e1ba5f01f.tar.bz2 scummvm-rg350-48406bbd418670b0c39d5cca17f9c84e1ba5f01f.zip | |
SCUMM: Simplify clampCameraPos() using CLIP
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/camera.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index 799fdd7547..5a81057aac 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -25,6 +25,8 @@ #include "scumm/charset.h" #include "scumm/scumm_v7.h" +#include "common/util.h" + namespace Scumm { void ScummEngine::setCameraAtEx(int at) { @@ -85,17 +87,8 @@ void ScummEngine::setCameraFollows(Actor *a, bool setCamera) { } void ScummEngine::clampCameraPos(Common::Point *pt) { - if (pt->x < VAR(VAR_CAMERA_MIN_X)) - pt->x = (short) VAR(VAR_CAMERA_MIN_X); - - if (pt->x > VAR(VAR_CAMERA_MAX_X)) - pt->x = (short) VAR(VAR_CAMERA_MAX_X); - - if (pt->y < VAR(VAR_CAMERA_MIN_Y)) - pt->y = (short) VAR(VAR_CAMERA_MIN_Y); - - if (pt->y > VAR(VAR_CAMERA_MAX_Y)) - pt->y = (short) VAR(VAR_CAMERA_MAX_Y); + pt->x = CLIP<short>(pt->x, VAR(VAR_CAMERA_MIN_X), VAR(VAR_CAMERA_MAX_X)); + pt->y = CLIP<short>(pt->y, VAR(VAR_CAMERA_MIN_Y), VAR(VAR_CAMERA_MAX_Y)); } void ScummEngine::moveCamera() { |