[Scummvm-git-logs] scummvm master -> 0880fd91ca1450245878f67c52fe73b3331cea5d

mduggan noreply at scummvm.org
Sun Nov 3 10:40:53 UTC 2024


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:
0880fd91ca DGDS: Drop non-existent global set to warning.


Commit: 0880fd91ca1450245878f67c52fe73b3331cea5d
    https://github.com/scummvm/scummvm/commit/0880fd91ca1450245878f67c52fe73b3331cea5d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-03T21:40:23+11:00

Commit Message:
DGDS: Drop non-existent global set to warning.

This happens when you right-click on the Fisto box in RotD.

This fixes #15454.

Changed paths:
    engines/dgds/globals.cpp


diff --git a/engines/dgds/globals.cpp b/engines/dgds/globals.cpp
index 35a67a0d7d2..f4141349c01 100644
--- a/engines/dgds/globals.cpp
+++ b/engines/dgds/globals.cpp
@@ -114,7 +114,9 @@ int16 Globals::setGlobal(uint16 num, int16 val) {
 			return global->set(val);
 	}
 
-	error("setGlobal: requested non-existing global %d", num);
+	// This happens eg looking at the Fisto box in RotD
+	warning("setGlobal: requested non-existing global %d", num);
+	return 0;
 }
 
 Common::Error Globals::syncState(Common::Serializer &s) {




More information about the Scummvm-git-logs mailing list