[Scummvm-git-logs] scummvm master -> 1c2f2b90308b5e4ad23f7cf0050e1d5efedd91f8

[sev-]

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

Summary:
d07e91a422 DIRECTOR: Improved warnings
18ce56fc1b DIRECTOR: Create path for the dumped scripts
1c2f2b9030 DIRECTOR: Fix warning text


Commit: d07e91a4221d0f420c9e0f169f9c9423476afeda
    https://github.com/scummvm/scummvm/commit/d07e91a4221d0f420c9e0f169f9c9423476afeda
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:30:59+02:00

Commit Message:
DIRECTOR: Improved warnings

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


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 97b0561e60..b2d72dacf3 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -411,7 +411,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 			stream->seek(startOffset + 8);
 			warning("dumped: %s", buf);
 		} else {
-			warning("Can not open dump file %s", buf);
+			warning("RIFXArchive::openStream(): Can not open dump file %s", buf);
 		}
 	}
 
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 734fdd0b26..baee7b27a8 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -972,7 +972,7 @@ void Cast::dumpScript(const char *script, ScriptType type, uint16 id) {
 	Common::String buf = dumpScriptName(_macName.c_str(), type, id, "txt");
 
 	if (!out.open(buf)) {
-		warning("Can not open dump file %s", buf.c_str());
+		warning("Cast::dumpScript(): Can not open dump file %s", buf.c_str());
 		return;
 	}
 
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index bbbb97dc29..f8cec0d63a 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -214,7 +214,7 @@ void Stage::loadEXEv3(Common::SeekableReadStream *stream) {
 
 
 			if (!out.open(fname.c_str())) {
-				warning("Can not open dump file %s", fname.c_str());
+				warning("Stage::loadEXEv3(): Can not open dump file %s", fname.c_str());
 			} else {
 				out.write(buf, mmmSize);
 


Commit: 18ce56fc1ba159c5236fc26b78d6140ccf94451b
    https://github.com/scummvm/scummvm/commit/18ce56fc1ba159c5236fc26b78d6140ccf94451b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:33:40+02:00

Commit Message:
DIRECTOR: Create path for the dumped scripts

Changed paths:
    engines/director/archive.cpp
    engines/director/cast.cpp
    engines/director/lingo/lingo-bytecode.cpp
    engines/director/resource.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index b2d72dacf3..f96acea632 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -397,7 +397,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 		char buf[256];
 		sprintf(buf, "./dumps/%s-%08x", g_director->getEXEName().c_str(), startOffset);
 
-		if (out.open(buf)) {
+		if (out.open(buf, true)) {
 			byte *data = (byte *)malloc(sz);
 
 			stream->seek(startOffset);
@@ -506,7 +506,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 			Common::String filename = Common::String::format("./dumps/%s-%s-%d", prepend.c_str(), tag2str(resources[i]->tag), i);
 			stream->read(data, len);
 
-			if (!out.open(filename)) {
+			if (!out.open(filename, true)) {
 				warning("MacResManager::dumpRaw(): Can not open dump file %s", filename.c_str());
 				break;
 			}
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index baee7b27a8..498362aad1 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -971,7 +971,7 @@ void Cast::dumpScript(const char *script, ScriptType type, uint16 id) {
 	Common::DumpFile out;
 	Common::String buf = dumpScriptName(_macName.c_str(), type, id, "txt");
 
-	if (!out.open(buf)) {
+	if (!out.open(buf, true)) {
 		warning("Cast::dumpScript(): Can not open dump file %s", buf.c_str());
 		return;
 	}
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index de69ae7b26..aca410f484 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -1116,7 +1116,7 @@ ScriptContext *Lingo::compileLingoV4(Common::SeekableSubReadStreamEndian &stream
 	if (ConfMan.getBool("dump_scripts")) {
 		Common::String buf = dumpScriptName(archName.c_str(), scriptType, castId, "lscr");
 
-		if (!out.open(buf)) {
+		if (!out.open(buf, true)) {
 			warning("Lingo::addCodeV4(): Can not open dump file %s", buf.c_str());
 			skipdump = true;
 		} else {
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index f8cec0d63a..3b2bbf66b0 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -213,7 +213,7 @@ void Stage::loadEXEv3(Common::SeekableReadStream *stream) {
 			Common::String fname = Common::String::format("./dumps/%s", mmmFileName.c_str());
 
 
-			if (!out.open(fname.c_str())) {
+			if (!out.open(fname.c_str(), true)) {
 				warning("Stage::loadEXEv3(): Can not open dump file %s", fname.c_str());
 			} else {
 				out.write(buf, mmmSize);


Commit: 1c2f2b90308b5e4ad23f7cf0050e1d5efedd91f8
    https://github.com/scummvm/scummvm/commit/1c2f2b90308b5e4ad23f7cf0050e1d5efedd91f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:55:08+02:00

Commit Message:
DIRECTOR: Fix warning text

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index f96acea632..9a9bafca32 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -507,7 +507,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 			stream->read(data, len);
 
 			if (!out.open(filename, true)) {
-				warning("MacResManager::dumpRaw(): Can not open dump file %s", filename.c_str());
+				warning("RIFXArchive::openStream(): Can not open dump file %s", filename.c_str());
 				break;
 			}