diff options
| author | Adrian Frühwirth | 2018-05-07 16:21:23 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-07 19:54:45 +0200 |
| commit | 019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227 (patch) | |
| tree | a0ebf587e455aedfea7d14be293fc6bfde0bc4ac /engines | |
| parent | 48406bbd418670b0c39d5cca17f9c84e1ba5f01f (diff) | |
| download | scummvm-rg350-019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227.tar.gz scummvm-rg350-019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227.tar.bz2 scummvm-rg350-019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227.zip | |
SAGA: Use CLIP in IsoMap::adjustScroll()
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/isomap.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp index cff415868e..afbe68c240 100644 --- a/engines/saga/isomap.cpp +++ b/engines/saga/isomap.cpp @@ -304,18 +304,8 @@ void IsoMap::adjustScroll(bool jump) { maxScrollPos.y = playerPoint.y + SAGA_SCROLL_LIMIT_Y2; if (jump) { - if (_viewScroll.y < minScrollPos.y) { - _viewScroll.y = minScrollPos.y; - } - if (_viewScroll.y > maxScrollPos.y) { - _viewScroll.y = maxScrollPos.y; - } - if (_viewScroll.x < minScrollPos.x) { - _viewScroll.x = minScrollPos.x; - } - if (_viewScroll.x > maxScrollPos.x) { - _viewScroll.x = maxScrollPos.x; - } + _viewScroll.x = CLIP(_viewScroll.x, minScrollPos.x, maxScrollPos.x); + _viewScroll.y = CLIP(_viewScroll.y, minScrollPos.y, maxScrollPos.y); } else { _viewScroll.y = smoothSlide(_viewScroll.y, minScrollPos.y, maxScrollPos.y); _viewScroll.x = smoothSlide(_viewScroll.x, minScrollPos.x, maxScrollPos.x); |