[Scummvm-git-logs] scummvm master -> 9ea943a81e73a18cce8ced74cf20303d0766a22d

bonki bonki at users.noreply.github.com
Mon May 7 19:55:08 CEST 2018


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48406bbd41 SCUMM: Simplify clampCameraPos() using CLIP
019eca0ae8 SAGA: Use CLIP in IsoMap::adjustScroll()
9ea943a81e DS: Use CLIP in VBlankHandler()


Commit: 48406bbd418670b0c39d5cca17f9c84e1ba5f01f
    https://github.com/scummvm/scummvm/commit/48406bbd418670b0c39d5cca17f9c84e1ba5f01f
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-07T19:54:45+02:00

Commit Message:
SCUMM: Simplify clampCameraPos() using CLIP

Changed paths:
    engines/scumm/camera.cpp


diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp
index 799fdd7..5a81057 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() {


Commit: 019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227
    https://github.com/scummvm/scummvm/commit/019eca0ae8fbc0ea39f5b36b9b68126ef9aa9227
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-07T19:54:45+02:00

Commit Message:
SAGA: Use CLIP in IsoMap::adjustScroll()

Changed paths:
    engines/saga/isomap.cpp


diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp
index cff4158..afbe68c 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);


Commit: 9ea943a81e73a18cce8ced74cf20303d0766a22d
    https://github.com/scummvm/scummvm/commit/9ea943a81e73a18cce8ced74cf20303d0766a22d
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-07T19:54:45+02:00

Commit Message:
DS: Use CLIP in VBlankHandler()

Changed paths:
    backends/platform/ds/arm9/source/dsmain.cpp


diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index c6d7d62..041892a 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -2165,19 +2165,11 @@ void VBlankHandler(void) {
 	}
 
 
-	subScTargetX = xCenter - ((subScreenWidth >> 1) << 8);
+	subScTargetX = xCenter - ((subScreenWidth  >> 1) << 8);
 	subScTargetY = yCenter - ((subScreenHeight >> 1) << 8);
 
-
-
-
-	if (subScTargetX < 0) subScTargetX = 0;
-	if (subScTargetX > (gameWidth - subScreenWidth) << 8) subScTargetX = (gameWidth - subScreenWidth) << 8;
-
-	if (subScTargetY < 0) subScTargetY = 0;
-	if (subScTargetY > (gameHeight - subScreenHeight) << 8) subScTargetY = (gameHeight - subScreenHeight) << 8;
-
-
+	subScTargetX = CLIP(subScTargetX, 0, (gameWidth  - subScreenWidth)  << 8);
+	subScTargetY = CLIP(subScTargetY, 0, (gameHeight - subScreenHeight) << 8);
 
 	subScX += (subScTargetX - subScX) >> 2;
 	subScY += (subScTargetY - subScY) >> 2;





More information about the Scummvm-git-logs mailing list