[Scummvm-git-logs] scummvm master -> 016680eb06c98447e187505ce4eca520077a4504

sev- noreply at scummvm.org
Sun Oct 5 20:13:26 UTC 2025


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

Summary:
ee9f868a02 WAGE: Sanity check for presence of sounds in file
016680eb06 GRAPHICS: MACGUI: Do not prematurely stop event processing on modifier keys


Commit: ee9f868a02f47aef78a65407e146203762b28713
    https://github.com/scummvm/scummvm/commit/ee9f868a02f47aef78a65407e146203762b28713
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-05T22:08:30+02:00

Commit Message:
WAGE: Sanity check for presence of sounds in file

Bug #16221: "WAGE: Brownie Saves the Day crashes on startup"

Changed paths:
    engines/wage/world.cpp


diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 93caef05e36..5dd15ace041 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -404,6 +404,11 @@ void World::loadExternalSounds(const Common::Path &fname) {
 	resArray = resMan.getResIDArray(MKTAG('A','S','N','D'));
 	for (iter = resArray.begin(); iter != resArray.end(); ++iter) {
 		res = resMan.getResource(MKTAG('A','S','N','D'), *iter);
+
+		if (!res) {
+			warning("Cannot load sound resource %d from file <%s>", *iter, fname.toString().c_str());
+			continue;
+		}
 		addSound(new Sound(resMan.getResName(MKTAG('A','S','N','D'), *iter), res));
 	}
 }


Commit: 016680eb06c98447e187505ce4eca520077a4504
    https://github.com/scummvm/scummvm/commit/016680eb06c98447e187505ce4eca520077a4504
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-05T22:12:32+02:00

Commit Message:
GRAPHICS: MACGUI: Do not prematurely stop event processing on modifier keys

Possibly fixes bug #16261: "WAGE: Can't type "$" on my Swedish keyboard"

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index a3e881dab04..35941d0710a 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1309,7 +1309,6 @@ bool MacText::processEvent(Common::Event &event) {
 			default:
 				break;
 			}
-			return false;
 		}
 
 		switch (event.kbd.keycode) {




More information about the Scummvm-git-logs mailing list