[Scummvm-git-logs] scummvm master -> 1ba5ecdde11c85b547b4cdd270d5939fde10a162

[sev-]

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

Summary:
aa99f15332 SLUDGE: Fix accidentally committed code
1ba5ecdde1 SLUDGE: Fix out-of-bounds access when scaling sprites


Commit: aa99f153329ed061d4eed3389491a1280e42a92a
    https://github.com/scummvm/scummvm/commit/aa99f153329ed061d4eed3389491a1280e42a92a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-03T15:57:35+02:00

Commit Message:
SLUDGE: Fix accidentally committed code

Changed paths:
    engines/sludge/zbuffer.cpp


diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 10b98ed31d..2659cde787 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -149,8 +149,6 @@ bool GraphicsManager::setZBuffer(int num) {
 				n &= 15;
 			}
 
-			byte *target = (byte *)_zBuffer->sprites[i].getBasePtr(x, y);
-			*target = n;
 			for (int i = 0; i < _zBuffer->numPanels; ++i) {
 				byte *target = (byte *)_zBuffer->sprites[i].getBasePtr(x, y);
 				if (n && (sorted[i] == n || i == 0)) {


Commit: 1ba5ecdde11c85b547b4cdd270d5939fde10a162
    https://github.com/scummvm/scummvm/commit/1ba5ecdde11c85b547b4cdd270d5939fde10a162
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-03T15:57:35+02:00

Commit Message:
SLUDGE: Fix out-of-bounds access when scaling sprites

Changed paths:
    engines/sludge/sprites.cpp


diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index cb057b15dd..921d86ca95 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -473,8 +473,8 @@ bool GraphicsManager::scaleSprite(Sprite &single, const SpritePalette &fontPal,
 	}
 
 	// Are we pointing at the sprite?
-	if (_vm->_evtMan->mouseX() >= x1 && _vm->_evtMan->mouseX() <= x2
-			&& _vm->_evtMan->mouseY() >= y1 && _vm->_evtMan->mouseY() <= y2) {
+	if (_vm->_evtMan->mouseX() >= x1 && _vm->_evtMan->mouseX() < x2
+			&& _vm->_evtMan->mouseY() >= y1 && _vm->_evtMan->mouseY() < y2) {
 		if (thisPerson->extra & EXTRA_RECTANGULAR)
 			return true;