[Scummvm-git-logs] scummvm master -> 584101954fb31f6b49569d78855ef23f4c239ce2

[neuromancer]

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

Summary:
d2ec8620e4 FREESCAPE: initialize _playerSid pointer
8f62e45396 FREESCAPE: improve end game handling when player fall
584101954f FREESCAPE: improved rendering of shield bar under fire


Commit: d2ec8620e4a60b518f36b952c5935fb0c9a83408
    https://github.com/scummvm/scummvm/commit/d2ec8620e4a60b518f36b952c5935fb0c9a83408
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2025-04-21T11:53:32+02:00

Commit Message:
FREESCAPE: initialize _playerSid pointer

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


diff --git a/engines/freescape/games/driller/driller.cpp b/engines/freescape/games/driller/driller.cpp
index 705ad142aff..3bd828e330f 100644
--- a/engines/freescape/games/driller/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -110,6 +110,7 @@ DrillerEngine::DrillerEngine(OSystem *syst, const ADGameDescription *gd) : Frees
 
 	_borderExtra = nullptr;
 	_borderExtraTexture = nullptr;
+	_playerSid = nullptr;
 }
 
 DrillerEngine::~DrillerEngine() {


Commit: 8f62e453969c0f79fca47d9e087efbfca6fe2153
    https://github.com/scummvm/scummvm/commit/8f62e453969c0f79fca47d9e087efbfca6fe2153
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2025-04-21T11:53:32+02:00

Commit Message:
FREESCAPE: improve end game handling when player fall

Changed paths:
    engines/freescape/freescape.cpp
    engines/freescape/movement.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 3e278ef07e3..d887c791d6a 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -527,6 +527,7 @@ void FreescapeEngine::processInput() {
 			if (event.type == Common::EVENT_SCREEN_CHANGED)
 				; // Allow event
 			else if (_gameStateControl == kFreescapeGameStateEnd
+				     && _endGamePlayerEndArea
 			         && (event.type == Common::EVENT_KEYDOWN || event.type == Common::EVENT_CUSTOM_ENGINE_ACTION_START)) {
 				_endGameKeyPressed = true;
 				continue;
diff --git a/engines/freescape/movement.cpp b/engines/freescape/movement.cpp
index 604d73ab53a..a5d0169f577 100644
--- a/engines/freescape/movement.cpp
+++ b/engines/freescape/movement.cpp
@@ -444,6 +444,7 @@ void FreescapeEngine::resolveCollisions(Math::Vector3d const position) {
 	if (fallen > _maxFallingDistance) {
 		_hasFallen = !_disableFalling;
 		_avoidRenderingFrames = 60 * 3;
+		_endGameDelayTicks = 60 * 5;
 		if (isEclipse()) // No need for an variable index, since these are special types of sound
 			playSoundFx(0, true);
 	}


Commit: 584101954fb31f6b49569d78855ef23f4c239ce2
    https://github.com/scummvm/scummvm/commit/584101954fb31f6b49569d78855ef23f4c239ce2
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2025-04-21T11:53:32+02:00

Commit Message:
FREESCAPE: improved rendering of shield bar under fire

Changed paths:
    engines/freescape/freescape.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index d887c791d6a..704fd1409fb 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -390,7 +390,8 @@ void FreescapeEngine::flashScreen(int backgroundColor) {
 }
 
 void FreescapeEngine::takeDamageFromSensor() {
-	_gameStateVars[k8bitVariableShield]--;
+	if (_gameStateVars[k8bitVariableShield] > 0)
+		_gameStateVars[k8bitVariableShield]--;
 }
 
 void FreescapeEngine::clearBackground() {
@@ -455,10 +456,6 @@ void FreescapeEngine::drawFrame() {
 				drawSensorShoot(sensor);
 		}
 		_underFireFrames--;
-		if (_underFireFrames == 0) {
-			_currentArea->unremapColor(_currentArea->_usualBackgroundColor);
-			_currentArea->unremapColor(_currentArea->_skyColor);
-		}
 	}
 
 	if (_shootingFrames > 0) {
@@ -474,6 +471,11 @@ void FreescapeEngine::drawFrame() {
 
 	drawBorder();
 	drawUI();
+
+	if (_underFireFrames == 0) {
+		_currentArea->unremapColor(_currentArea->_usualBackgroundColor);
+		_currentArea->unremapColor(_currentArea->_skyColor);
+	}
 }
 
 void FreescapeEngine::pressedKey(const int keycode) {}