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

rvanlaar noreply at scummvm.org
Thu Mar 24 21:16:23 UTC 2022


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:
f7742344e5 DIRECTOR: don't error on dumping dangling scripts


Commit: f7742344e59efc47f5dcaa5c715c7b7368f9347b
    https://github.com/scummvm/scummvm/commit/f7742344e59efc47f5dcaa5c715c7b7368f9347b
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-24T22:16:05+01:00

Commit Message:
DIRECTOR: don't error on dumping dangling scripts

Some scripts are of type NoneScript or unkown.
Those scripts halted dumping. Now the scripts get a typeName of none or unkown.

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 6d32cebe0c0..4d50473b9d9 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -765,7 +765,9 @@ Common::String dumpScriptName(const char *prefix, int type, int id, const char *
 	switch (type) {
 	case kNoneScript:
 	default:
-		error("dumpScriptName(): Incorrect call (type %d)", type);
+		typeName = "unknown";
+		warning("dumpScriptName(): Incorrect call (type %d)", type);
+		break;
 	case kMovieScript:
 		typeName = "movie";
 		break;




More information about the Scummvm-git-logs mailing list