diff options
| author | Einar Johan Trøan Sømåen | 2012-07-23 03:42:27 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-23 03:42:27 +0200 |
| commit | c7eda9abc80d1912148cae4292b94620c67a9c19 (patch) | |
| tree | b416c3ee3d2f2274b578a9bd8c8f3b01523cacc9 /engines/wintermute/base/scriptables | |
| parent | aedb0aea505e764c4c7bab1f90520b380be4d688 (diff) | |
| download | scummvm-rg350-c7eda9abc80d1912148cae4292b94620c67a9c19.tar.gz scummvm-rg350-c7eda9abc80d1912148cae4292b94620c67a9c19.tar.bz2 scummvm-rg350-c7eda9abc80d1912148cae4292b94620c67a9c19.zip | |
WINTERMUTE: Encapsulate and distance BasePersistenceManager from Base.
Diffstat (limited to 'engines/wintermute/base/scriptables')
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index bdd11ca06a..52490c0710 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -1199,7 +1199,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_gameRef));
// buffer
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
if (_state != SCRIPT_PERSISTENT && _state != SCRIPT_FINISHED && _state != SCRIPT_THREAD_FINISHED) {
persistMgr->transfer(TMEMBER(_bufferSize));
persistMgr->putBytes(_buffer, _bufferSize);
@@ -1249,7 +1249,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_unbreakable));
persistMgr->transfer(TMEMBER(_parentScript));
- if (!persistMgr->_saving) _tracingMode = false;
+ if (!persistMgr->getIsSaving()) _tracingMode = false;
return STATUS_OK;
}
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index c275ebf5af..59ec113d1f 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -448,7 +448,7 @@ bool ScEngine::resetScript(ScScript *script) { //////////////////////////////////////////////////////////////////////////
bool ScEngine::persist(BasePersistenceManager *persistMgr) {
- if (!persistMgr->_saving) cleanup();
+ if (!persistMgr->getIsSaving()) cleanup();
persistMgr->transfer(TMEMBER(_gameRef));
persistMgr->transfer(TMEMBER(_currentScript));
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 383b956555..92943f7485 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -730,7 +730,7 @@ bool SXFile::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_textMode));
uint32 pos = 0;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
pos = getPos();
persistMgr->transfer(TMEMBER(pos));
} else {
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 79ba978002..b625fad400 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -486,7 +486,7 @@ bool SXMemBuffer::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_size));
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
if (_size > 0) persistMgr->putBytes((byte *)_buffer, _size);
} else {
if (_size > 0) {
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index e645772b6f..5e01e5e29c 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -383,7 +383,7 @@ bool SXString::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_capacity));
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
if (_capacity > 0) persistMgr->putBytes((byte *)_string, _capacity);
} else {
if (_capacity > 0) {
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index 0d8c34e719..6d12c34914 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -748,7 +748,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) { int size;
const char *str;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
size = _valObject.size();
persistMgr->transfer("", &size);
_valIter = _valObject.begin();
|