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

peterkohaut peterkohaut at users.noreply.github.com
Thu Jul 18 18:23:31 CEST 2019


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:
b3508245a0 BLADERUNNER: Make subtitles variable local (#1753)


Commit: b3508245a0940bbe9829f2bcae926c49c39c38b8
    https://github.com/scummvm/scummvm/commit/b3508245a0940bbe9829f2bcae926c49c39c38b8
Author: dafioram (dafioram at gmail.com)
Date: 2019-07-18T18:23:28+02:00

Commit Message:
BLADERUNNER: Make subtitles variable local (#1753)

Changed paths:
    engines/bladerunner/subtitles.cpp


diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index 2170638..36daee3 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -122,14 +122,14 @@ Subtitles::~Subtitles() {
 //
 void Subtitles::init(void) {
 	// Loading subtitles versioning info if available
-	TextResource *versionTxtResource = new TextResource(_vm);
-	if ( versionTxtResource->open(SUBTITLES_VERSION_TRENAME, false)) {
-		_subtitlesInfo.credits = versionTxtResource->getText((uint32)0);
-		_subtitlesInfo.versionStr = versionTxtResource->getText((uint32)1);
-		_subtitlesInfo.dateOfCompile = versionTxtResource->getText((uint32)2);
-		_subtitlesInfo.languageMode = versionTxtResource->getText((uint32)3);
-		Common::String fontType = versionTxtResource->getText((uint32)4);
-		_subtitlesInfo.fontName = versionTxtResource->getText((uint32)5);
+	TextResource versionTxtResource(_vm);
+	if ( versionTxtResource.open(SUBTITLES_VERSION_TRENAME, false)) {
+		_subtitlesInfo.credits = versionTxtResource.getText((uint32)0);
+		_subtitlesInfo.versionStr = versionTxtResource.getText((uint32)1);
+		_subtitlesInfo.dateOfCompile = versionTxtResource.getText((uint32)2);
+		_subtitlesInfo.languageMode = versionTxtResource.getText((uint32)3);
+		Common::String fontType = versionTxtResource.getText((uint32)4);
+		_subtitlesInfo.fontName = versionTxtResource.getText((uint32)5);
 
 		if (fontType.equalsIgnoreCase("ttf")) {
 			_subtitlesInfo.fontType = Subtitles::kSubtitlesFontTypeTTF;
@@ -147,8 +147,6 @@ void Subtitles::init(void) {
 		       _subtitlesInfo.languageMode.c_str(),
 		       _subtitlesInfo.credits.c_str());
 
-		delete versionTxtResource;
-		versionTxtResource = nullptr;
 	} else {
 		debug("Subtitles version info: N/A");
 	}





More information about the Scummvm-git-logs mailing list