aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobia Tesan2016-03-05 20:41:19 +0100
committerTobia Tesan2016-03-05 20:41:19 +0100
commitf29229c0a6e60fa3486436f8454bdd66c3c0796e (patch)
tree8933c878176a2b466b5682d9cdb19ccb2c0102c0
parent2c8160245460cc9a7a864b58b4e962f7a2c77c4b (diff)
downloadscummvm-rg350-f29229c0a6e60fa3486436f8454bdd66c3c0796e.tar.gz
scummvm-rg350-f29229c0a6e60fa3486436f8454bdd66c3c0796e.tar.bz2
scummvm-rg350-f29229c0a6e60fa3486436f8454bdd66c3c0796e.zip
WINTERMUTE: Return Common::String in getGameTargetName()
-rw-r--r--engines/wintermute/base/base_engine.h2
-rw-r--r--engines/wintermute/base/base_file_manager.cpp2
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;
}