[Scummvm-git-logs] scummvm master -> 5ce61cc98250b2595c6a60ec91428cfbfd6b5c97

[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:
5cb955e34e DGDS: Add character-related globals for HoC
5ce61cc982 DGDS: Hide the intro skip menu when jumping to the main game


Commit: 5cb955e34ec0c621756f1a6d28b3b4094e7b5b99
    https://github.com/scummvm/scummvm/commit/5cb955e34ec0c621756f1a6d28b3b4094e7b5b99
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-07T13:33:27+03:00

Commit Message:
DGDS: Add character-related globals 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 bbeedcb8474..564e211dea6 100644
--- a/engines/dgds/globals.cpp
+++ b/engines/dgds/globals.cpp
@@ -205,9 +205,10 @@ Common::Error DragonGlobals::syncState(Common::Serializer &s) {
 }
 
 HocGlobals::HocGlobals(Clock &clock) : Globals(clock),
-	_unk39(0), _unk40(0), _unk45(0), _unk48(0), _unk51(0), _unk52(0), _unk54(0) {
+	_unk39(0), _unk40(0), _unk45(0), _unk48(0), _unk51(0), _characterCount(0), _currentCharacter(0), _unk54(0) {
 	_globals.push_back(new RWI16Global(0x36, &_unk54));
-	_globals.push_back(new RWI16Global(0x34, &_unk52));
+	_globals.push_back(new RWI16Global(0x35, &_currentCharacter));
+	_globals.push_back(new RWI16Global(0x34, &_characterCount));
 	_globals.push_back(new RWI16Global(0x33, &_unk51));
 	_globals.push_back(new RWI16Global(0x30, &_unk48));
 	_globals.push_back(new RWI16Global(0x2D, &_unk45));
@@ -220,8 +221,10 @@ Common::Error HocGlobals::syncState(Common::Serializer &s) {
 	s.syncAsSint16LE(_unk39);
 	s.syncAsSint16LE(_unk40);
 	s.syncAsSint16LE(_unk45);
+	s.syncAsSint16LE(_unk48);
 	s.syncAsSint16LE(_unk51);
-	s.syncAsSint16LE(_unk52);
+	s.syncAsSint16LE(_characterCount);
+	s.syncAsSint16LE(_currentCharacter);
 	s.syncAsSint16LE(_unk54);
 
 	return Common::kNoError;
diff --git a/engines/dgds/globals.h b/engines/dgds/globals.h
index fb8c60dae87..520638a2bc2 100644
--- a/engines/dgds/globals.h
+++ b/engines/dgds/globals.h
@@ -156,7 +156,8 @@ private:
 	int16 _unk45;
 	int16 _unk48;
 	int16 _unk51;
-	int16 _unk52;
+	int16 _characterCount;
+	int16 _currentCharacter;
 	int16 _unk54;
 
 	Common::Error syncState(Common::Serializer &s) override;


Commit: 5ce61cc98250b2595c6a60ec91428cfbfd6b5c97
    https://github.com/scummvm/scummvm/commit/5ce61cc98250b2595c6a60ec91428cfbfd6b5c97
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-07T13:33:27+03:00

Commit Message:
DGDS: Hide the intro skip menu when jumping to the main game

Changed paths:
    engines/dgds/menu.cpp


diff --git a/engines/dgds/menu.cpp b/engines/dgds/menu.cpp
index 0485320c4eb..8fb8d80af1b 100644
--- a/engines/dgds/menu.cpp
+++ b/engines/dgds/menu.cpp
@@ -460,6 +460,7 @@ void Menu::handleClickSkipPlayIntroMenu(const Common::Point &mouse) {
 			engine->changeScene(24);
 		break;
 	case kMenuIntroJumpToGame:
+		hideMenu();
 		if (engine->getGameId() == GID_HOC)
 			engine->changeScene(24);
 		else if (engine->getGameId() == GID_WILLY)