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

[a-yyg]

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:
5001268e3b SAGA2: Fix protagonist check in ObjectSensor::check
9e894a82d6 SAGA2: Fix mouse tooltip centering


Commit: 5001268e3b86bed3668a592a73d0d5f73202d32a
    https://github.com/scummvm/scummvm/commit/5001268e3b86bed3668a592a73d0d5f73202d32a
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-13T21:57:12+09:00

Commit Message:
SAGA2: Fix protagonist check in ObjectSensor::check

Changed paths:
    engines/saga2/sensor.cpp


diff --git a/engines/saga2/sensor.cpp b/engines/saga2/sensor.cpp
index 6f588c3945..b05bd8a2d6 100644
--- a/engines/saga2/sensor.cpp
+++ b/engines/saga2/sensor.cpp
@@ -484,13 +484,13 @@ bool ObjectSensor::check(SenseInfo &info, uint32 senseFlags) {
 	    getRange() != 0 ? getRange() : kTileUVSize * kPlatformWidth * 8);
 	GameObject              *objToTest;
 	iter.first(&objToTest);
-	bool                    objToTestIsActor = isActor(objToTest);
 
 	for (iter.first(&objToTest);
 	        objToTest != NULL;
 	        iter.next(&objToTest)) {
 		if (senseFlags & (1 << actorBlind))
 			continue;
+		bool objToTestIsActor = isActor(objToTest);
 
 		//  This extra test is a HACK to ensure that the center actor
 		//  will be able to sense a protaganist even if the protaganist


Commit: 9e894a82d63a5a69c299c4a620e63b182b87c607
    https://github.com/scummvm/scummvm/commit/9e894a82d63a5a69c299c4a620e63b182b87c607
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-13T21:57:12+09:00

Commit Message:
SAGA2: Fix mouse tooltip centering

Changed paths:
    engines/saga2/panel.cpp


diff --git a/engines/saga2/panel.cpp b/engines/saga2/panel.cpp
index ecd42f15db..1ff6624f31 100644
--- a/engines/saga2/panel.cpp
+++ b/engines/saga2/panel.cpp
@@ -766,6 +766,7 @@ void gToolBase::handleMouse(Common::Event &event, uint32 time) {
 	case Common::EVENT_MOUSEMOVE:
 		_curMouseState.pos.x = event.mouse.x;
 		_curMouseState.pos.y = event.mouse.y;
+		g_vm->_pointer->move(Point16(_curMouseState.pos.x, _curMouseState.pos.y));
 		break;
 	default:
 		break;