[Scummvm-git-logs] scummvm master -> 24863f14962efe9fce5ce6a8baa93bb83c8d6dc0

[eriktorbjorn]

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:
24863f1496 SCUMM: Simplify startManiac() a little


Commit: 24863f14962efe9fce5ce6a8baa93bb83c8d6dc0
    https://github.com/scummvm/scummvm/commit/24863f14962efe9fce5ce6a8baa93bb83c8d6dc0
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-02-03T17:33:43+01:00

Commit Message:
SCUMM: Simplify startManiac() a little

Instead of using matchString(), simply check the baseName() of the game.
This is a bit more strict than before, but matches the documentation so
that should be ok.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 0277db3c2b1..1647b5509ae 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3768,11 +3768,7 @@ bool ScummEngine::startManiac() {
 
 			if (path.isRelativeTo(currentPath)) {
 				path = path.relativeTo(currentPath);
-				// Do a case-insensitive non-path-mode match of the remainder.
-				// While strictly speaking it's too broad, this matchString
-				// ignores the presence or absence of trailing path separators
-				// in either currentPath or path.
-				if (path.toString('/').matchString("*maniac*", true, nullptr)) {
+				if (path.baseName().equalsIgnoreCase("maniac")) {
 					maniacTarget = iter->_key;
 					break;
 				}