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

dreammaster noreply at scummvm.org
Sat Mar 22 03:20:02 UTC 2025


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

Summary:
c5c816eab8 GOT: Restrict eyeballs mode to only part 2 shovel maze


Commit: c5c816eab8a8d20a65bbd94f53b307465a1e2dd3
    https://github.com/scummvm/scummvm/commit/c5c816eab8a8d20a65bbd94f53b307465a1e2dd3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-03-21T20:19:58-07:00

Commit Message:
GOT: Restrict eyeballs mode to only part 2 shovel maze

Changed paths:
    engines/got/game/back.cpp
    engines/got/game/main.cpp


diff --git a/engines/got/game/back.cpp b/engines/got/game/back.cpp
index 406ac84226f..543f228af5c 100644
--- a/engines/got/game/back.cpp
+++ b/engines/got/game/back.cpp
@@ -46,7 +46,7 @@ const char *ITEM_NAMES[] = {
 static const char *odinEndMessage;
 
 void showLevel(const int newLevel) {
-	if (newLevel == 105) { // Shovel Maze
+	if (_G(area) == 2 && newLevel == 105) { // Shovel Maze
 		_G(thorInfo)._armor = 2; // eyeballs mode
 		loadNewThor();
 		_G(eyeballs) = 1;
diff --git a/engines/got/game/main.cpp b/engines/got/game/main.cpp
index db9f9b51d25..87a9a0c8068 100644
--- a/engines/got/game/main.cpp
+++ b/engines/got/game/main.cpp
@@ -66,7 +66,7 @@ void setupLoad() {
 	_G(currentLevel) = _G(newLevel);
 	showLevel(_G(newLevel));
 
-	if (_G(currentLevel) == 105) { // Shovel Maze
+	if (_G(area) == 2 && _G(currentLevel) == 105) { // Shovel Maze
 		_G(thorInfo)._armor = 2; // eyeballs mode
 		loadNewThor();
 		_G(eyeballs) = 1;




More information about the Scummvm-git-logs mailing list