[Scummvm-git-logs] scummvm master -> 9e1fd0e70bdde854582c508e3b39f43e415d2af4

[bluegr]

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:
5da28d3549 DGDS: Add another global for HoC
9e1fd0e70b DGDS: Hook up the jump to game button for HoC, in the intro skip menu


Commit: 5da28d35498a07ee74be814858ba8f289596ef3c
    https://github.com/scummvm/scummvm/commit/5da28d35498a07ee74be814858ba8f289596ef3c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-07T05:26:29+03:00

Commit Message:
DGDS: Add another global for HoC

Changed paths:
    engines/dgds/globals.cpp
    engines/dgds/globals.h


diff --git a/engines/dgds/globals.cpp b/engines/dgds/globals.cpp
index 53053598565..99132bc429f 100644
--- a/engines/dgds/globals.cpp
+++ b/engines/dgds/globals.cpp
@@ -210,10 +210,11 @@ Common::Error DragonGlobals::syncState(Common::Serializer &s) {
 }
 
 HocGlobals::HocGlobals(Clock &clock) : Globals(clock),
-	_unk39(0), _unk40(0), _unk45(0), _unk51(0), _unk52(0), _unk54(0) {
+	_unk39(0), _unk40(0), _unk45(0), _unk48(0), _unk51(0), _unk52(0), _unk54(0) {
 	_globals.push_back(new RWI16Global(0x36, &_unk54));
 	_globals.push_back(new RWI16Global(0x34, &_unk52));
 	_globals.push_back(new RWI16Global(0x33, &_unk51));
+	_globals.push_back(new RWI16Global(0x30, &_unk48));
 	_globals.push_back(new RWI16Global(0x2D, &_unk45));
 	_globals.push_back(new RWI16Global(0x28, &_unk40));
 	_globals.push_back(new RWI16Global(0x27, &_unk39));
diff --git a/engines/dgds/globals.h b/engines/dgds/globals.h
index 341fa00e9ab..acd9de82384 100644
--- a/engines/dgds/globals.h
+++ b/engines/dgds/globals.h
@@ -153,6 +153,7 @@ private:
 	int16 _unk39;
 	int16 _unk40;
 	int16 _unk45;
+	int16 _unk48;
 	int16 _unk51;
 	int16 _unk52;
 	int16 _unk54;


Commit: 9e1fd0e70bdde854582c508e3b39f43e415d2af4
    https://github.com/scummvm/scummvm/commit/9e1fd0e70bdde854582c508e3b39f43e415d2af4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-07T05:30:55+03:00

Commit Message:
DGDS: Hook up the jump to game button for HoC, in the intro skip menu

Changed paths:
    engines/dgds/menu.cpp


diff --git a/engines/dgds/menu.cpp b/engines/dgds/menu.cpp
index 00d7cc20f25..d7c4a192451 100644
--- a/engines/dgds/menu.cpp
+++ b/engines/dgds/menu.cpp
@@ -419,6 +419,8 @@ void Menu::handleClickOptionsMenu(const Common::Point &mouse) {
 	switch (clickedMenuItem) {
 	case kMenuOptionsJoystickOnOff:
 	case kMenuOptionsMouseOnOff:  // same id as kMenuMaybeBetterSaveNo
+		// Do nothing - we don't toggle joystick or mouse functionality
+		break;
 	case kMenuOptionsSoundsOnOff: // same id as kMenuMaybeBetterSaveYes
 	case kMenuOptionsMusicOnOff:
 		// TODO
@@ -452,8 +454,10 @@ void Menu::handleClickSkipPlayIntroMenu(const Common::Point &mouse) {
 			engine->changeScene(24);
 		break;
 	case kMenuIntroJumpToGame:
-		// TODO
-		debug("Clicked option with ID %d", clickedMenuItem);
+		if (engine->getGameId() == GID_HOC)
+			engine->changeScene(24);
+		else if (engine->getGameId() == GID_WILLY)
+			warning("TODO: Jump to game");
 		break;
 	default:
 		handleClick(mouse);