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

[sev-]

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

Summary:
7830f936aa DIRECTOR: Fix crash when built-in is being redefined
a132d6aa78 DIRECTOR: More streamlined movie loading tracing


Commit: 7830f936aa2e9ea3668edea3eba8896dbc194cde
    https://github.com/scummvm/scummvm/commit/7830f936aa2e9ea3668edea3eba8896dbc194cde
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-10T22:51:41+01:00

Commit Message:
DIRECTOR: Fix crash when built-in is being redefined

Changed paths:
    engines/director/lingo/lingo-codegen.cpp


diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 9077e9d..4d15f96 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -242,7 +242,12 @@ Symbol *Lingo::define(Common::String &name, int nargs, ScriptData *code) {
 		// we don't want to be here. The getHandler call should have used the EntityId and the result
 		// should have been unique!
 		warning("Redefining handler '%s'", name.c_str());
-		delete sym->u.defn;
+
+		// Do not attempt to remove code from built-ins
+		if (sym->type == HANDLER)
+			delete sym->u.defn;
+		else
+			sym->type = HANDLER;
 	}
 
 	sym->u.defn = code;


Commit: a132d6aa7887a09a43cd550e3d0f6d82776324ce
    https://github.com/scummvm/scummvm/commit/a132d6aa7887a09a43cd550e3d0f6d82776324ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-10T22:52:00+01:00

Commit Message:
DIRECTOR: More streamlined movie loading tracing

Changed paths:
    engines/director/director.cpp
    engines/director/resource.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 3695615..332b8b5 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -314,7 +314,9 @@ MovieReference DirectorEngine::getNextMovieFromQueue() {
 
 	res.movie = _movieQueue.front();
 
-	debug(1, "=========> Next movie is %s", res.movie.c_str());
+	debug(0, "=======================================");
+	debug(0, "=========> Next movie is %s", res.movie.c_str());
+	debug(0, "=======================================");
 
 	_movieQueue.remove_at(0);
 
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index bd8000d..d0f802a 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -284,10 +284,6 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 
 	Archive *shardcst = createArchive();
 
-	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-	debug(0, "@@@@ Loading Shared cast '%s'", filename.c_str());
-	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
-
 	_sharedDIB = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
 	_sharedSTXT = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
 	_sharedSound = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
@@ -301,6 +297,10 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 		return;
 	}
 
+	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+	debug(0, "@@@@ Loading Shared cast '%s'", filename.c_str());
+	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
+
 	_sharedScore = new Score(this);
 	_sharedScore->setArchive(shardcst);