diff options
| author | Tobia Tesan | 2016-03-06 11:47:24 +0100 |
|---|---|---|
| committer | Tobia Tesan | 2016-03-06 11:47:24 +0100 |
| commit | 97dc2a22c4cb9f40956966d682cf9ce0b985960b (patch) | |
| tree | 201d415b1cd1a51992364932b276661a73500471 | |
| parent | f29229c0a6e60fa3486436f8454bdd66c3c0796e (diff) | |
| download | scummvm-rg350-97dc2a22c4cb9f40956966d682cf9ce0b985960b.tar.gz scummvm-rg350-97dc2a22c4cb9f40956966d682cf9ce0b985960b.tar.bz2 scummvm-rg350-97dc2a22c4cb9f40956966d682cf9ce0b985960b.zip | |
WINTERMUTE: Use Common::String in BasePersistenceManager-ctor
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index bb5e0c4091..0a0ba91e5d 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -56,7 +56,7 @@ namespace Wintermute { #define SAVE_MAGIC_3 0x12564154 ////////////////////////////////////////////////////////////////////////// -BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool deleteSingleton) { +BasePersistenceManager::BasePersistenceManager(const Common::String &savePrefix, bool deleteSingleton) { _saving = false; _offset = 0; _saveStream = nullptr; @@ -91,7 +91,7 @@ BasePersistenceManager::BasePersistenceManager(const char *savePrefix, bool dele _thumbnailDataSize = 0; _thumbnailData = nullptr; - if (savePrefix) { + if (savePrefix != "") { _savePrefix = savePrefix; } else if (_gameRef) { _savePrefix = _gameRef->getGameTargetName(); diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 373d1580de..9187976931 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -86,7 +86,7 @@ public: bool transferCharPtr(const char *name, char **val); bool transferString(const char *name, Common::String *val); bool transferVector2(const char *name, Vector2 *val); - BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); + BasePersistenceManager(const Common::String &savePrefix = "", bool deleteSingleton = false); virtual ~BasePersistenceManager(); bool checkVersion(byte verMajor, byte verMinor, byte verBuild); |