[Scummvm-git-logs] scummvm master -> 08d3c7f636f7957412d4f50e39e77442f5c437b6

[antoniou79]

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:
cb49ac1ae1 BLADERUNNER: Ensure A.TLK is closed onShutdown
08d3c7f636 BLADERUNNER: Close A.TLK within proper define check


Commit: cb49ac1ae167dba3ced8170834bd2d81839a5c1d
    https://github.com/scummvm/scummvm/commit/cb49ac1ae167dba3ced8170834bd2d81839a5c1d
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-04-10T19:37:21+03:00

Commit Message:
BLADERUNNER: Ensure A.TLK is closed onShutdown

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 2bf358d..e34c05e 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -710,6 +710,10 @@ void BladeRunnerEngine::shutdown() {
 		closeArchive("SPCHSFX.TLK");
 	}
 
+	if (isArchiveOpen("A.TLK")) {
+		closeArchive("A.TLK");
+	}
+
 	if (isArchiveOpen("SFX.MIX")) {
 		closeArchive("SFX.MIX");
 	}


Commit: 08d3c7f636f7957412d4f50e39e77442f5c437b6
    https://github.com/scummvm/scummvm/commit/08d3c7f636f7957412d4f50e39e77442f5c437b6
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-04-10T19:39:13+03:00

Commit Message:
BLADERUNNER: Close A.TLK within proper define check

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index e34c05e..31aae35 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -710,9 +710,12 @@ void BladeRunnerEngine::shutdown() {
 		closeArchive("SPCHSFX.TLK");
 	}
 
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
 	if (isArchiveOpen("A.TLK")) {
 		closeArchive("A.TLK");
 	}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 
 	if (isArchiveOpen("SFX.MIX")) {
 		closeArchive("SFX.MIX");