[Scummvm-git-logs] scummvm master -> ef841f615e558fe2f51301712da03072e9194033

bluegr bluegr at gmail.com
Tue Oct 23 00:32:46 CEST 2018


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

Summary:
ef841f615e SCI32: Always start in the Bridge room in Hoyle 5 Bridge


Commit: ef841f615e558fe2f51301712da03072e9194033
    https://github.com/scummvm/scummvm/commit/ef841f615e558fe2f51301712da03072e9194033
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-10-23T01:32:26+03:00

Commit Message:
SCI32: Always start in the Bridge room in Hoyle 5 Bridge

It's the only game included, so there's no point showing the game
selection menu in this case. This follows the behavior of the original

Changed paths:
    engines/sci/engine/kmisc.cpp


diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index db2b310..92a9cfa 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -415,7 +415,15 @@ reg_t kGetConfig(EngineState *s, int argc, reg_t *argv) {
 		s->_segMan->strcpy(data, "");
 	} else if (setting == "game") {
 		// Hoyle 5 startup, specifies the number of the game to start.
-		s->_segMan->strcpy(data, "");
+		if (g_sci->getGameId() == GID_HOYLE5 &&
+			!g_sci->getResMan()->testResource(ResourceId(kResourceTypeScript, 100)) &&
+			g_sci->getResMan()->testResource(ResourceId(kResourceTypeScript, 700))) {
+			// Special case for Hoyle 5 Bridge: only one game is included (Bridge),
+			// so mimic the setting in 700.cfg and set the starting room number to 700.
+			s->_segMan->strcpy(data, "700");
+		} else {
+			s->_segMan->strcpy(data, "");
+		}
 	} else if (setting == "laptop") {
 		// Hoyle 5 startup.
 		s->_segMan->strcpy(data, "");





More information about the Scummvm-git-logs mailing list