[Scummvm-git-logs] scummvm master -> 6c45026b530a8a1767e2961567740ff04f3f4291

[LittleToonCat]

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

Summary:
2e3e86321f SCUMM HE: Add competitive_mods to login JSON payload
920f08dfa9 SCUMM HE: Send full ScummVM verison
4636a90a8d SCUMM HE: Increase inside pitches hit quality competitive mod
6c45026b53 SCUMM HE: Remove gScummVMVersionLite which is no longer needed


Commit: 2e3e86321ff361e91b1b34d30fa5afe00d58a23f
    https://github.com/scummvm/scummvm/commit/2e3e86321ff361e91b1b34d30fa5afe00d58a23f
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-04-10T23:41:05-03:00

Commit Message:
SCUMM HE: Add competitive_mods to login JSON payload

Changed paths:
    engines/scumm/he/net/net_lobby.cpp


diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index 0982071a4a8..c30d251ceaa 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -435,6 +435,7 @@ void Lobby::login(const char *userName, const char *password) {
 	loginRequestParameters.setVal("pass", new Common::JSONValue((Common::String)password));
 	loginRequestParameters.setVal("game", new Common::JSONValue((Common::String)_gameName));
 	loginRequestParameters.setVal("version", new Common::JSONValue(gScummVMVersionLite));
+	loginRequestParameters.setVal("competitive_mods", new Common::JSONValue(ConfMan.getBool("enable_competitive_mods")));
 
 	send(loginRequestParameters);
 }


Commit: 920f08dfa901bbda2e606c34a3ddd344870405c2
    https://github.com/scummvm/scummvm/commit/920f08dfa901bbda2e606c34a3ddd344870405c2
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-04-10T23:41:05-03:00

Commit Message:
SCUMM HE: Send full ScummVM verison

Changed paths:
    engines/scumm/he/net/net_lobby.cpp


diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index c30d251ceaa..e3579a043df 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -434,7 +434,7 @@ void Lobby::login(const char *userName, const char *password) {
 	loginRequestParameters.setVal("user", new Common::JSONValue(_userName));
 	loginRequestParameters.setVal("pass", new Common::JSONValue((Common::String)password));
 	loginRequestParameters.setVal("game", new Common::JSONValue((Common::String)_gameName));
-	loginRequestParameters.setVal("version", new Common::JSONValue(gScummVMVersionLite));
+	loginRequestParameters.setVal("version", new Common::JSONValue(gScummVMFullVersion));
 	loginRequestParameters.setVal("competitive_mods", new Common::JSONValue(ConfMan.getBool("enable_competitive_mods")));
 
 	send(loginRequestParameters);


Commit: 4636a90a8d42a91e015cf31c41461621e6157be0
    https://github.com/scummvm/scummvm/commit/4636a90a8d42a91e015cf31c41461621e6157be0
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-04-10T23:41:05-03:00

Commit Message:
SCUMM HE: Increase inside pitches hit quality competitive mod

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 29d8c4b7e2e..783c03c428d 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -577,6 +577,26 @@ int ScummEngine::readVar(uint var) {
 		if (_game.heversion >= 80) {
 			var &= 0xFFF;
 			assertRange(0, var, _numRoomVariables - 1, "room variable (reading)");
+
+#if defined(USE_ENET) && defined(USE_LIBCURL)
+			if (ConfMan.getBool("enable_competitive_mods")) {
+				// Mod for Backyard Baseball 2001 online competitive play: increase hit quality
+				// for pitches on the inside corners
+				if (_game.id == GID_BASEBALL2001 &&
+					_currentRoom == 4 && vm.slot[_currentScript].number == 2085 &&  // The script that calculates hit quality
+					readVar(399) == 1 &&  // Check that we're playing online
+					var == 2 &&  // Reading room variable 2, which is the zone that the ball is pitched to
+					readVar(447) == 1  // And the batter is in an open stance
+				) {
+					if (_roomVars[0] == 1 && (_roomVars[var] == 9 || _roomVars[var] == 37)) {  // Right-handed batter
+						return _roomVars[var] + 1;
+					} else if (_roomVars[0] == 2 && (_roomVars[var] == 13 || _roomVars[var] == 41)) {  // Left-handed batter
+						return _roomVars[var] - 1;
+					}
+				}
+			}
+#endif
+
 			return _roomVars[var];
 
 		} else if (_game.version <= 3 && !(_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns) &&


Commit: 6c45026b530a8a1767e2961567740ff04f3f4291
    https://github.com/scummvm/scummvm/commit/6c45026b530a8a1767e2961567740ff04f3f4291
Author: shkupfer (shkupfer at ncsu.edu)
Date: 2023-04-10T23:41:05-03:00

Commit Message:
SCUMM HE: Remove gScummVMVersionLite which is no longer needed

Changed paths:
    base/version.cpp
    base/version.h


diff --git a/base/version.cpp b/base/version.cpp
index c06e372bfbd..f6442c055d2 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -55,7 +55,6 @@
  * to properly work in exports (i.e. release tar balls etc.).
  */
 const char gScummVMVersion[] = SCUMMVM_VERSION SCUMMVM_REVISION;
-const char gScummVMVersionLite[] = SCUMMVM_VERSION;
 #if defined(__amigaos4__) || defined(__MORPHOS__)
 static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
 #endif
diff --git a/base/version.h b/base/version.h
index a8dccb40661..657a703f41d 100644
--- a/base/version.h
+++ b/base/version.h
@@ -23,7 +23,6 @@
 #define BASE_VERSION_H
 
 extern const char gScummVMVersion[];     // e.g. "0.4.1"
-extern const char gScummVMVersionLite[]; // e.g. "0.4.1" (without version control revisions)
 extern const char gScummVMBuildDate[];   // e.g. "2003-06-24"
 extern const char gScummVMVersionDate[]; // e.g. "0.4.1 (2003-06-24)"
 extern const char gScummVMCompiler[];    // e.g. "GCC 11.2.0"