[Scummvm-git-logs] scummvm master -> 487ee5905aa13d322d9873977accc704d169f1f8

[sev-]

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:
d96d589a7d SCUMM HE: BYB '01 online mod: allow forced runner turnaround
487ee5905a SCUMM HE: Only apply mod for pop-up with < 2 outs


Commit: d96d589a7ddff3578201cfcfbaeba4c9412e7a53
    https://github.com/scummvm/scummvm/commit/d96d589a7ddff3578201cfcfbaeba4c9412e7a53
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-03-23T00:53:59+01:00

Commit Message:
SCUMM HE: BYB '01 online mod: allow forced runner turnaround

Changed paths:
    engines/scumm/he/script_v72he.cpp


diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 1ad8be1120f..431cd5fb59e 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -173,6 +173,23 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
 			  FROM_LE_32(ah->dim2start), FROM_LE_32(ah->dim2end));
 	}
 
+#if defined(USE_ENET) && defined(USE_LIBCURL)
+	if (ConfMan.getBool("enable_competitive_mods")) {
+		// Mod for Backyard Baseball 2001 online competitive play: allow baserunners to be
+		// turned around while they're jogging to the next base on a pop-up.
+		// The game checks if the runner is forced to the next base (i.e. there's a runner on the base behind them),
+		// and if they are then basepath clicks to turn them around have no effect.
+		// Here we return 0 (false) no matter what, so these clicks now have the desired effect.
+		if (_game.id == GID_BASEBALL2001 &&
+			_currentRoom == 3 && vm.slot[_currentScript].number == 2076 &&  // This is the script that handles basepath clicks
+			readVar(399) == 1 &&  // This checks that we're playing online
+			// This is the array of baserunner status info, and the value in position 8 specifies whether the runner is forced
+			array == 295 && idx1 == 8) {
+			return 0;
+		}
+	}
+#endif
+
 	const int offset = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) *
 		(idx2 - FROM_LE_32(ah->dim2start)) + (idx1 - FROM_LE_32(ah->dim1start));
 


Commit: 487ee5905aa13d322d9873977accc704d169f1f8
    https://github.com/scummvm/scummvm/commit/487ee5905aa13d322d9873977accc704d169f1f8
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-03-23T00:53:59+01:00

Commit Message:
SCUMM HE: Only apply mod for pop-up with < 2 outs

Changed paths:
    engines/scumm/he/script_v72he.cpp


diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 431cd5fb59e..f0215e272dc 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -179,10 +179,13 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
 		// turned around while they're jogging to the next base on a pop-up.
 		// The game checks if the runner is forced to the next base (i.e. there's a runner on the base behind them),
 		// and if they are then basepath clicks to turn them around have no effect.
-		// Here we return 0 (false) no matter what, so these clicks now have the desired effect.
+		// Here we return 0 (false) under certain conditions, so these clicks now have the desired effect.
 		if (_game.id == GID_BASEBALL2001 &&
 			_currentRoom == 3 && vm.slot[_currentScript].number == 2076 &&  // This is the script that handles basepath clicks
 			readVar(399) == 1 &&  // This checks that we're playing online
+			readVar(0x8000 + 11) == 1 &&  // The ball is a pop-up
+			readVar(291) < 2 &&  // Less than two outs
+			readVar(300) == 0 &&  // Ball hasn't bounced
 			// This is the array of baserunner status info, and the value in position 8 specifies whether the runner is forced
 			array == 295 && idx1 == 8) {
 			return 0;