[Scummvm-git-logs] scummvm master -> 04bd190e58565695ed2501100690803b5761767b

[sluicebox]

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:
2c9807335a SCI: Add detection for Betrayed Alliance version 1.3.1
04bd190e58 SCI: Fix fallback detection for unknown fan games


Commit: 2c9807335a9f7e5a92a27884ef91f9300c65380c
    https://github.com/scummvm/scummvm/commit/2c9807335a9f7e5a92a27884ef91f9300c65380c
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-07T20:25:04-07:00

Commit Message:
SCI: Add detection for Betrayed Alliance version 1.3.1

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 6afbc9d3335..60265c0eda3 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -6366,6 +6366,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 	FANMADE("Betrayed Alliance 1.1", "bb776e42e93f8b98006d6481fb73a588", 4080, "ad7bcfa11f914f23ddbe32723700391e", 2391020),
 	FANMADE("Betrayed Alliance 1.2", "ade9f8124dae2e6aced8b5bfc0f54411", 4200, "4599d184348e8dfa99a1804f41966177", 2498493), // original version
 	FANMADE("Betrayed Alliance 1.2", "30431334d821d23e584d6f4c0a3d5b61", 4206, "42e3a857f589eef8a8567b86b71f7fb9", 2503541), // "stealth updated" version
+	FANMADE("Betrayed Alliance 1.3.1", "c6e60d28086cfa5655af3701c8e2d181", 4878, "c9329736f06cc9ab17f370c93d1fd2fd", 3326253),
 	FANMADE("Betrayed Alliance Book 2 Demo 1.0", "b5b21ca4d1ad3c576e9776bf96845656", 4524, "57150380af9bf05b07851177e01c5066", 3309884),
 	FANMADE("Bluntman and Chronic (Politically Correct Version)", "c3ef9fa6c7c5fb840078bf28d87c7f8b", 1362, "441636a9f6f86710844868fded868ee7", 596688),
 	FANMADE("Cascade Quest", "c94efc10d18c040b6e22a1dc6d3adfe1", 3468, "8ada33dfa945f81531e5508240b573de", 1432195),


Commit: 04bd190e58565695ed2501100690803b5761767b
    https://github.com/scummvm/scummvm/commit/04bd190e58565695ed2501100690803b5761767b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-07T20:25:04-07:00

Commit Message:
SCI: Fix fallback detection for unknown fan games

Fan games are now playable even without detection entries.

Fallback detection takes the name of the game object and maps it to
the ScummVM game id. Prior to this change, if we didn't know the game
object name, we propagated this unknown internal string to the ScummVM
game id for the entry, where it was guaranteed to fail.

Now unknown game object names are mapped to the id for fan games.

Changed paths:
    engines/sci/metaengine.cpp


diff --git a/engines/sci/metaengine.cpp b/engines/sci/metaengine.cpp
index 36c045ac195..644992fd052 100644
--- a/engines/sci/metaengine.cpp
+++ b/engines/sci/metaengine.cpp
@@ -181,8 +181,8 @@ static bool isSierraDemo(const Common::String &sierraId, uint32 resourceCount) {
 }
 
 /**
- * Converts the builtin Sierra game IDs to the ones we use in ScummVM
- * @param[in] sierraId		The internal game ID
+ * Converts the builtin Sierra game object name to the ID we use in ScummVM
+ * @param[in] sierraId		The internal `Game` object's name
  * @param[in] sciVersion    The detected SCI version
  * @param[in] resMan		The resource manager
  * @param[in] isDemo        Returns a flag if it's a demo
@@ -261,7 +261,8 @@ static Common::String convertSierraGameId(Common::String sierraId, SciVersion sc
 		return "qfg3";
 	}
 
-	return sierraId;
+	// We don't recognize the game object name; assume it's a fan game.
+	return "sci-fanmade";
 }
 
 } // End of namespace Sci