[Scummvm-git-logs] scummvm master -> a0299557fafac4ef9abac560293bbaded9c2d080

[neuromancer]

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:
d10e37af93 FREESCAPE: reset mouse position after changing some area in driller
2946c71652 FREESCAPE: fixed bug goToArea implementation of driller
a0299557fa FREESCAPE: show message at the end of the game in driller


Commit: d10e37af934c97f2d8e9716de7771431691a9d42
    https://github.com/scummvm/scummvm/commit/d10e37af934c97f2d8e9716de7771431691a9d42
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T21:14:05+01:00

Commit Message:
FREESCAPE: reset mouse position after changing some area in driller

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 74e70bafcbf..903906632ad 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -119,7 +119,8 @@ void DrillerEngine::gotoArea(uint16 areaID, int entranceID) {
 		swapPalette(areaID);
 
 	if (areaID != _startArea || entranceID != _startEntrance) {
-		_lastMousePos = g_system->getEventManager()->getMousePos();
+		g_system->warpMouse(_crossairPosition.x, _crossairPosition.y);
+		_lastMousePos = _crossairPosition;
 		rotate(0, 0);
 	}
 }


Commit: 2946c7165273bbd295cb250ba04ab5af35cea925
    https://github.com/scummvm/scummvm/commit/2946c7165273bbd295cb250ba04ab5af35cea925
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T21:14:05+01:00

Commit Message:
FREESCAPE: fixed bug goToArea implementation of driller

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 903906632ad..2ea092e400f 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -100,9 +100,10 @@ void DrillerEngine::gotoArea(uint16 areaID, int entranceID) {
 	}
 	_lastPosition = _position;
 
-	if (areaID == _startArea) {
+	if (areaID == _startArea && entranceID == _startEntrance) {
 		_yaw = 280;
 	} else if (areaID == 127) {
+		assert(entranceID == 0);
 		_yaw = 90;
 		_pitch = 335;
 		_flyMode = true; // Avoid falling


Commit: a0299557fafac4ef9abac560293bbaded9c2d080
    https://github.com/scummvm/scummvm/commit/a0299557fafac4ef9abac560293bbaded9c2d080
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T21:14:05+01:00

Commit Message:
FREESCAPE: show message at the end of the game in driller

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 2ea092e400f..7210cacb7d8 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -780,6 +780,10 @@ bool DrillerEngine::checkIfGameEnded() {
 	}
 
 	if (_currentArea->getAreaID() == 127) {
+		if (_gameStateVars[32] == 18) { // All areas are complete
+			insertTemporaryMessage(_messagesList[19], _countdown - 2);
+			_gameStateVars[32] = 0;  // Avoid repeating the message
+		}
 		drawFrame();
 		_gfx->flipBuffer();
 		g_system->updateScreen();