[Scummvm-cvs-logs] scummvm master -> d60e4eee3f3203a6fe74749d5ac17c974c051180
sev-
sev at scummvm.org
Sun Mar 6 12:21:20 CET 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f29229c0a6 WINTERMUTE: Return Common::String in getGameTargetName()
97dc2a22c4 WINTERMUTE: Use Common::String in BasePersistenceManager-ctor
9222038a16 WINTERMUTE: Use Common::String in arg for initSave
d60e4eee3f Merge pull request #691 from tobiatesan/common_string_target
Commit: f29229c0a6e60fa3486436f8454bdd66c3c0796e
https://github.com/scummvm/scummvm/commit/f29229c0a6e60fa3486436f8454bdd66c3c0796e
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-03-05T20:41:19+01:00
Commit Message:
WINTERMUTE: Return Common::String in getGameTargetName()
Changed paths:
engines/wintermute/base/base_engine.h
engines/wintermute/base/base_file_manager.cpp
diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h
index 0f4a6b0..cbf5d92 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 05830ff..4dce2f1 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;
}
Commit: 97dc2a22c4cb9f40956966d682cf9ce0b985960b
https://github.com/scummvm/scummvm/commit/97dc2a22c4cb9f40956966d682cf9ce0b985960b
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-03-06T11:47:24+01:00
Commit Message:
WINTERMUTE: Use Common::String in BasePersistenceManager-ctor
Changed paths:
engines/wintermute/base/base_persistence_manager.cpp
engines/wintermute/base/base_persistence_manager.h
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index bb5e0c4..0a0ba91 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 373d158..9187976 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);
Commit: 9222038a162ebd483f7791006672f2effb0206de
https://github.com/scummvm/scummvm/commit/9222038a162ebd483f7791006672f2effb0206de
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-03-06T12:00:05+01:00
Commit Message:
WINTERMUTE: Use Common::String in arg for initSave
Changed paths:
engines/wintermute/base/base_persistence_manager.cpp
engines/wintermute/base/base_persistence_manager.h
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 0a0ba91..39462f7 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -215,8 +215,8 @@ bool BasePersistenceManager::getSaveExists(int slot) {
}
//////////////////////////////////////////////////////////////////////////
-bool BasePersistenceManager::initSave(const char *desc) {
- if (!desc) {
+bool BasePersistenceManager::initSave(const Common::String &desc) {
+ if (desc == "") {
return STATUS_FAILED;
}
@@ -297,11 +297,11 @@ bool BasePersistenceManager::initSave(const char *desc) {
uint32 dataOffset = _offset +
sizeof(uint32) + // data offset
- sizeof(uint32) + strlen(desc) + 1 + // description
+ sizeof(uint32) + strlen(desc.c_str()) + 1 + // description
sizeof(uint32); // timestamp
putDWORD(dataOffset);
- putString(desc);
+ putString(desc.c_str());
g_system->getTimeAndDate(_savedTimestamp);
putTimeDate(_savedTimestamp);
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 9187976..760b45c 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -63,7 +63,7 @@ public:
uint32 getMaxUsedSlot();
bool getSaveExists(int slot);
bool initLoad(const Common::String &filename);
- bool initSave(const char *desc);
+ bool initSave(const Common::String &desc);
bool getBytes(byte *buffer, uint32 size);
bool putBytes(byte *buffer, uint32 size);
uint32 _offset;
Commit: d60e4eee3f3203a6fe74749d5ac17c974c051180
https://github.com/scummvm/scummvm/commit/d60e4eee3f3203a6fe74749d5ac17c974c051180
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-06T12:21:15+01:00
Commit Message:
Merge pull request #691 from tobiatesan/common_string_target
WINTERMUTE: Return Common::String in getGameTargetName()
Changed paths:
engines/wintermute/base/base_engine.h
engines/wintermute/base/base_file_manager.cpp
engines/wintermute/base/base_persistence_manager.cpp
engines/wintermute/base/base_persistence_manager.h
More information about the Scummvm-git-logs
mailing list