[Scummvm-git-logs] scummvm master -> f76a9afe982268b739158656f8660593679e6f62
antoniou79
noreply at scummvm.org
Thu Aug 21 21:29:13 UTC 2025
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d44fbee1cc TSAGE: BLUEFORCE: Fix interaction with Larry
668cec49fe TSAGE: BLUEFORCE: Set USE cursor after using radio dispatch
629aabc268 TSAGE: BLUEFORCE: Properly clear flags when traveling
05c861fe32 TSAGE: BLUEFORCE: Show USE cursor while in map
f76a9afe98 TSAGE: BLUEFORCE: Fix radio dispatch code cases
Commit: d44fbee1cc8a7fd817d7dbd2f47e1ad8e7cbc1b9
https://github.com/scummvm/scummvm/commit/d44fbee1cc8a7fd817d7dbd2f47e1ad8e7cbc1b9
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-22T00:25:22+03:00
Commit Message:
TSAGE: BLUEFORCE: Fix interaction with Larry
Fix the TALK interaction for Larry at the jail
Changed paths:
engines/tsage/blue_force/blueforce_scenes3.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index e0dd41f977b..a4dbe87493e 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -5727,12 +5727,13 @@ bool Scene390::Green::startAction(CursorType action, Event &event) {
bool Scene390::Object2::startAction(CursorType action, Event &event) {
Scene390 *scene = (Scene390 *)BF_GLOBALS._sceneManager._scene;
-
+ // Larry at the Jail
switch (action) {
case CURSOR_TALK:
- if (!_flag)
+ if (_flag)
break;
+ BF_GLOBALS._player.disableControl();
if (!BF_GLOBALS.getFlag(onDuty)) {
scene->_sceneMode = 3917;
} else if (BF_GLOBALS.getFlag(fTalkedToBarry) && !BF_GLOBALS.getFlag(fTalkedToLarry)) {
Commit: 668cec49fea0258b581b75e4e193c2159ed98179
https://github.com/scummvm/scummvm/commit/668cec49fea0258b581b75e4e193c2159ed98179
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-22T00:25:22+03:00
Commit Message:
TSAGE: BLUEFORCE: Set USE cursor after using radio dispatch
Previously the cursor would change to WALK cursor, which is not the original behavior
Changing to WALK cursor is also not user friendly, because the player typically needs to enter more than one code in the radio dispatch and that required more clicks to switch from WALK to USE
Changed paths:
engines/tsage/blue_force/blueforce_dialogs.cpp
diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 2b96ca68d8e..53336847963 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -399,7 +399,7 @@ RadioConvDialog::RadioConvDialog() : GfxDialog() {
}
RadioConvDialog::~RadioConvDialog() {
- BF_GLOBALS._events.setCursor(CURSOR_WALK);
+ BF_GLOBALS._events.setCursor(CURSOR_USE);
}
int RadioConvDialog::execute() {
Commit: 629aabc26866419af79cd6860a8de33fe97b81fa
https://github.com/scummvm/scummvm/commit/629aabc26866419af79cd6860a8de33fe97b81fa
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-22T00:25:22+03:00
Commit Message:
TSAGE: BLUEFORCE: Properly clear flags when traveling
At the destination selected signal() of the map
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 3418629d8d4..a9919e122b9 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -481,18 +481,18 @@ void Scene50::signal() {
}
if ((BF_GLOBALS._driveFromScene == 410) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
- BF_GLOBALS.setFlag(f1097Frankie);
+ BF_GLOBALS.clearFlag(f1097Frankie);
}
if ((BF_GLOBALS._driveFromScene == 340) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
- BF_GLOBALS.setFlag(f1097Marina);
+ BF_GLOBALS.clearFlag(f1097Marina);
}
if ((BF_GLOBALS._driveFromScene == 380) && (_sceneNumber != BF_GLOBALS._driveFromScene)) {
if (BF_GLOBALS._bookmark >= bLauraToParamedics)
- BF_GLOBALS.setFlag(f1098Marina);
+ BF_GLOBALS.clearFlag(f1098Marina);
if (BF_GLOBALS._bookmark >= bStoppedFrankie)
- BF_GLOBALS.setFlag(f1098Frankie);
+ BF_GLOBALS.clearFlag(f1098Frankie);
if (BF_GLOBALS._bookmark == bArrestedGreen) {
BF_GLOBALS._deathReason = 19;
_sceneNumber = 666;
Commit: 05c861fe327fdde4270294ec0ad8c2fb355efba1
https://github.com/scummvm/scummvm/commit/05c861fe327fdde4270294ec0ad8c2fb355efba1
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-22T00:25:22+03:00
Commit Message:
TSAGE: BLUEFORCE: Show USE cursor while in map
As is in the original
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index a9919e122b9..e2697c55480 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -509,7 +509,7 @@ void Scene50::signal() {
// Initial delay complete, time to switch to interactive mode
_text.remove();
BF_GLOBALS._player.enableControl();
- BF_GLOBALS._events.setCursor(CURSOR_WALK);
+ BF_GLOBALS._events.setCursor(CURSOR_USE);
_sceneMode = 0;
}
}
Commit: f76a9afe982268b739158656f8660593679e6f62
https://github.com/scummvm/scummvm/commit/f76a9afe982268b739158656f8660593679e6f62
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-08-22T00:25:22+03:00
Commit Message:
TSAGE: BLUEFORCE: Fix radio dispatch code cases
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index e2697c55480..335b6112517 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -817,9 +817,9 @@ void Scene60::Action1::signal() {
_state = useRadio();
setDelay(4);
break;
- case 3:
+ case 3: // Put in a radio dispatch code
switch (_state) {
- case 1:
+ case 1: // 10-04
if (BF_GLOBALS.removeFlag(fCan1004Marina)) {
T2_GLOBALS._uiElements.addScore(10);
_state = 606;
@@ -830,10 +830,10 @@ void Scene60::Action1::signal() {
_state = 611;
}
break;
- case 2:
+ case 2: // 10-13
_state = 612;
break;
- case 3:
+ case 3: // 10-15
if (BF_GLOBALS.removeFlag(f1015Marina)) {
T2_GLOBALS._uiElements.addScore(10);
_state = 613;
@@ -847,7 +847,7 @@ void Scene60::Action1::signal() {
_state = 616;
}
break;
- case 4:
+ case 4: // 10-27
if (BF_GLOBALS.removeFlag(f1027Marina)) {
T2_GLOBALS._uiElements.addScore(10);
_actionIndex = 5;
@@ -856,7 +856,7 @@ void Scene60::Action1::signal() {
T2_GLOBALS._uiElements.addScore(10);
_actionIndex = 5;
_state = 618;
- } else if (BF_GLOBALS.removeFlag(f1015Drunk)) {
+ } else if (BF_GLOBALS.removeFlag(f1027Drunk)) {
T2_GLOBALS._uiElements.addScore(10);
_actionIndex = 5;
_state = 619;
@@ -864,7 +864,7 @@ void Scene60::Action1::signal() {
_state = 620;
}
break;
- case 5:
+ case 5: // 10-35
if (BF_GLOBALS.removeFlag(f1035Marina)) {
BF_GLOBALS.setFlag(fCalledBackup);
T2_GLOBALS._uiElements.addScore(50);
@@ -872,7 +872,6 @@ void Scene60::Action1::signal() {
} else if (BF_GLOBALS.removeFlag(f1035Frankie)) {
BF_GLOBALS.setFlag(fCalledBackup);
T2_GLOBALS._uiElements.addScore(50);
- _actionIndex = 5;
_state = 622;
} else if (BF_GLOBALS.removeFlag(f1035Drunk)) {
T2_GLOBALS._uiElements.addScore(10);
@@ -881,13 +880,12 @@ void Scene60::Action1::signal() {
_state = 624;
}
break;
- case 6:
+ case 6: // 10-97
if (BF_GLOBALS.removeFlag(f1097Marina)) {
T2_GLOBALS._uiElements.addScore(10);
_state = 625;
} else if (BF_GLOBALS.removeFlag(f1097Frankie)) {
T2_GLOBALS._uiElements.addScore(10);
- _actionIndex = 5;
_state = 626;
} else if (BF_GLOBALS.removeFlag(f1097Drunk)) {
T2_GLOBALS._uiElements.addScore(10);
@@ -896,7 +894,7 @@ void Scene60::Action1::signal() {
_state = 628;
}
break;
- case 7:
+ case 7: // 10-98
if (BF_GLOBALS.removeFlag(f1098Marina)) {
T2_GLOBALS._uiElements.addScore(10);
_state = 629;
@@ -910,7 +908,7 @@ void Scene60::Action1::signal() {
_state = 632;
}
break;
- case 0:
+ case 0: // 10-02
default:
_state = 610;
break;
More information about the Scummvm-git-logs
mailing list