[Scummvm-git-logs] scummvm master -> 825f6acf9a69a16ee64ee63dc064389f3519135b

[antoniou79]

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:
bf6047be9a Revert "TSAGE: BLUEFORCE: Fix bad palette state after The Next Day"
ccab97bb5d TSAGE: Proper fix for bad palette state in some scenes
825f6acf9a TSAGE: BLUEFORCE: Fix hotspot region for Jake's house


Commit: bf6047be9ad18a98b444e2c2743505f391ecc464
    https://github.com/scummvm/scummvm/commit/bf6047be9ad18a98b444e2c2743505f391ecc464
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-18T12:37:47+03:00

Commit Message:
Revert "TSAGE: BLUEFORCE: Fix bad palette state after The Next Day"

This reverts commit 0d7dc616a750fd074575fea009b0b90d57d8c6ca.

This did not fully fix the issue (bad palette outside the house), but seems to only "toggle" the conditions for the bug manifesting

Changed paths:
    engines/tsage/blue_force/blueforce_scenes1.cpp


diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index 896f093fe76..fe05783688f 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -3014,9 +3014,6 @@ void Scene180::signal() {
 		break;
 	case 6:
 		loadScene(1180);
-		// Fix for color glitch (white / very bright color on House walls and the action/verb wheel popup) 
-		// after "The Next Day" message fade out (eg. after the transition between first day and second day morning)
-		BF_GLOBALS._scenePalette.refresh();
 		BF_GLOBALS._sound1.fadeSound(33);
 
 		switch (BF_GLOBALS._bookmark) {


Commit: ccab97bb5d3f5b26193fa5b814fed3f80177c25a
    https://github.com/scummvm/scummvm/commit/ccab97bb5d3f5b26193fa5b814fed3f80177c25a
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-18T12:38:33+03:00

Commit Message:
TSAGE: Proper fix for bad palette state in some scenes

The cause was an apparent typo in the code that preventing restoring the palette colors after displaying a scene text message

To consistently reproduce the old issue, that this commit fixes, in Blue Force do the following (minimum number of steps):
At the end of day 1, after Jake goes to his room to check the box granma left for him,
click USE (hand icon) on the door (a text message will appear)
click WALK on the door to leave the room
After the cutscene and "The Next Day" interlude, the scene outside the house and the UI for the verb wheel would have bad palette colors (white color in wrong places)

Changed paths:
    engines/tsage/core.cpp


diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 03595ac42c0..e43a446fa9a 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1766,7 +1766,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
 				// Set secondary fg color
 				int v = va_arg(va, int);
 				g_globals->_sceneText._color3 = v;
-				g_globals->gfxManager()._font._colors.foreground = v;
+				g_globals->gfxManager()._font._colors2.foreground = v;
 				break;
 			}
 			case SET_POS_MODE:


Commit: 825f6acf9a69a16ee64ee63dc064389f3519135b
    https://github.com/scummvm/scummvm/commit/825f6acf9a69a16ee64ee63dc064389f3519135b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-18T12:40:31+03:00

Commit Message:
TSAGE: BLUEFORCE: Fix hotspot region for Jake's house

In the screen (house outside view) shown after the end of day 1.

Verified with  dissasembly

Changed paths:
    engines/tsage/blue_force/blueforce_scenes1.cpp


diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index fe05783688f..cc4247d52dc 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -3051,7 +3051,7 @@ void Scene180::signal() {
 		_palms.setDetails(6, 180, 12, 13, 14, 1);
 		_garage.setDetails(Rect(241, 85, 319, 121), 180, 30, 31, 32, 1, NULL);
 		_fence.setDetails(Rect(0, 109, 21, 125), 180, 9, 10, 11, 1, NULL);
-		_house.setDetails(4, 180, 24, 25, 26, 1);
+		_house.setDetails(5, 180, 24, 25, 26, 1);
 		_steps.setDetails(7, 180, 6, 7, 8, 1);
 		_curb.setDetails(2, 180, 3, 4, 5, 1);
 		_sky.setDetails(Rect(0, 0, 319, 190), 180, 0, 1, 2, 1, NULL);