[Scummvm-git-logs] scummvm master -> 709d703789ac1c7ec5bb9500c362d0f3dca0b77b

[sev-]

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:
709d703789 DRAGONS: Fix portability


Commit: 709d703789ac1c7ec5bb9500c362d0f3dca0b77b
    https://github.com/scummvm/scummvm/commit/709d703789ac1c7ec5bb9500c362d0f3dca0b77b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-25T15:51:58+01:00

Commit Message:
DRAGONS: Fix portability

Changed paths:
    engines/dragons/dragons.h
    engines/dragons/saveload.cpp


diff --git a/engines/dragons/dragons.h b/engines/dragons/dragons.h
index 21755ee033..e4059f50d9 100644
--- a/engines/dragons/dragons.h
+++ b/engines/dragons/dragons.h
@@ -204,7 +204,7 @@ public:
 	void updateEvents();
 	Common::Error run() override;
 
-	const char *getSavegameFilename(int num);
+	Common::String getSavegameFilename(int num);
 	static Common::String getSavegameFilename(const Common::String &target, int num);
 	static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *in, SaveHeader &header, bool skipThumbnail = true);
 
diff --git a/engines/dragons/saveload.cpp b/engines/dragons/saveload.cpp
index d6d3da8835..200d6f2893 100644
--- a/engines/dragons/saveload.cpp
+++ b/engines/dragons/saveload.cpp
@@ -141,23 +141,19 @@ bool DragonsEngine::loadgame(const char *filename) {
 }
 
 Common::Error DragonsEngine::loadGameState(int slot) {
-	const char *fileName = getSavegameFilename(slot);
-	if (!loadgame(fileName))
+	if (!loadgame(getSavegameFilename(slot).c_str()))
 		return Common::kReadingFailed;
 	return Common::kNoError;
 }
 
 Common::Error DragonsEngine::saveGameState(int slot, const Common::String &description, bool isAutoSave) {
-	const char *fileName = getSavegameFilename(slot);
-	if (!savegame(fileName, description.c_str()))
+	if (!savegame(getSavegameFilename(slot).c_str(), description.c_str()))
 		return Common::kWritingFailed;
 	return Common::kNoError;
 }
 
-const char *DragonsEngine::getSavegameFilename(int num) {
-	static Common::String filename;
-	filename = getSavegameFilename(_targetName, num);
-	return filename.c_str();
+Common::String DragonsEngine::getSavegameFilename(int num) {
+	return getSavegameFilename(_targetName, num);
 }
 
 Common::String DragonsEngine::getSavegameFilename(const Common::String &target, int num) {