[Scummvm-git-logs] scummvm master -> 2672e5eb5bd8c2465062bfad1f940ee5bccb1798

[dreammaster]

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:
61f8e05169 NUVIE: Bump up data files version to 1.1
2672e5eb5b NUVIE: Fix calling close on freed IO buffer


Commit: 61f8e05169e6a450d9777f352ffb62fcabaceb57
    https://github.com/scummvm/scummvm/commit/61f8e05169e6a450d9777f352ffb62fcabaceb57
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-09T17:13:31-07:00

Commit Message:
NUVIE: Bump up data files version to 1.1

Changed paths:
    devtools/create_ultima/files/ultima6/version.txt
    engines/ultima/nuvie/nuvie.cpp


diff --git a/devtools/create_ultima/files/ultima6/version.txt b/devtools/create_ultima/files/ultima6/version.txt
index d3827e75a5..9459d4ba2a 100644
--- a/devtools/create_ultima/files/ultima6/version.txt
+++ b/devtools/create_ultima/files/ultima6/version.txt
@@ -1 +1 @@
-1.0
+1.1
diff --git a/engines/ultima/nuvie/nuvie.cpp b/engines/ultima/nuvie/nuvie.cpp
index b8281f86e5..ff4776f63b 100644
--- a/engines/ultima/nuvie/nuvie.cpp
+++ b/engines/ultima/nuvie/nuvie.cpp
@@ -67,7 +67,7 @@ NuvieEngine::~NuvieEngine() {
 bool NuvieEngine::isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) {
 	folder = "ultima6";
 	majorVersion = 1;
-	minorVersion = 0;
+	minorVersion = 1;
 	return true;
 }
 


Commit: 2672e5eb5bd8c2465062bfad1f940ee5bccb1798
    https://github.com/scummvm/scummvm/commit/2672e5eb5bd8c2465062bfad1f940ee5bccb1798
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-09T17:54:19-07:00

Commit Message:
NUVIE: Fix calling close on freed IO buffer

Changed paths:
    engines/ultima/nuvie/script/script_cutscene.cpp


diff --git a/engines/ultima/nuvie/script/script_cutscene.cpp b/engines/ultima/nuvie/script/script_cutscene.cpp
index dba94a80f4..4eea51ca73 100644
--- a/engines/ultima/nuvie/script/script_cutscene.cpp
+++ b/engines/ultima/nuvie/script/script_cutscene.cpp
@@ -1239,8 +1239,6 @@ Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char
 
 	config_get_path(config, filename, path);
 
-
-
 	Std::vector<Std::vector<CSImage *> > v;
 	U6Lzw lzw;
 
@@ -1289,6 +1287,8 @@ Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char
 				v.push_back(v1);
 			}
 		}
+
+		lib_n.close();
 	}
 
 	if (buf)