From f29229c0a6e60fa3486436f8454bdd66c3c0796e Mon Sep 17 00:00:00 2001 From: Tobia Tesan Date: Sat, 5 Mar 2016 20:41:19 +0100 Subject: WINTERMUTE: Return Common::String in getGameTargetName() --- engines/wintermute/base/base_engine.h | 2 +- engines/wintermute/base/base_file_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h index 0f4a6b0775..cbf5d92d00 100644 --- a/engines/wintermute/base/base_engine.h +++ b/engines/wintermute/base/base_engine.h @@ -74,7 +74,7 @@ public: static const Timer *getTimer(); static const Timer *getLiveTimer(); static void LOG(bool res, const char *fmt, ...); - const char *getGameTargetName() const { return _targetName.c_str(); } + Common::String getGameTargetName() const { return _targetName; } Common::String getGameId() const { return _gameId; } Common::Language getLanguage() const { return _language; } WMETargetExecutable getTargetExecutable() const { diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index 05830ffcd8..4dce2f1756 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -318,7 +318,7 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f bool BaseFileManager::hasFile(const Common::String &filename) { if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) { - BasePersistenceManager pm(BaseEngine::instance().getGameTargetName()); + BasePersistenceManager pm(BaseEngine::instance().getGameTargetName().c_str()); if (filename.size() <= 9) { return false; } -- cgit v1.2.3