aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/ad/ad_game.cpp4
-rw-r--r--engines/wintermute/base/base_fader.cpp2
-rw-r--r--engines/wintermute/base/base_game.cpp4
-rw-r--r--engines/wintermute/base/base_keyboard_state.cpp4
-rw-r--r--engines/wintermute/base/base_persistence_manager.cpp16
-rw-r--r--engines/wintermute/base/base_persistence_manager.h25
-rw-r--r--engines/wintermute/base/base_script_holder.cpp2
-rw-r--r--engines/wintermute/base/base_surface_storage.cpp2
-rw-r--r--engines/wintermute/base/font/base_font_bitmap.cpp2
-rw-r--r--engines/wintermute/base/font/base_font_storage.cpp2
-rw-r--r--engines/wintermute/base/font/base_font_truetype.cpp4
-rw-r--r--engines/wintermute/base/particles/part_emitter.cpp4
-rw-r--r--engines/wintermute/base/particles/part_force.cpp2
-rw-r--r--engines/wintermute/base/particles/part_particle.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script.cpp4
-rw-r--r--engines/wintermute/base/scriptables/script_engine.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script_ext_file.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script_ext_string.cpp2
-rw-r--r--engines/wintermute/base/scriptables/script_value.cpp2
-rw-r--r--engines/wintermute/base/sound/base_sound.cpp4
-rw-r--r--engines/wintermute/coll_templ.h4
-rw-r--r--engines/wintermute/ui/ui_button.cpp2
-rw-r--r--engines/wintermute/ui/ui_edit.cpp2
-rw-r--r--engines/wintermute/video/video_theora_player.cpp4
25 files changed, 55 insertions, 50 deletions
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index ef5461bb5e..d75f41e38e 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1252,7 +1252,7 @@ bool AdGame::loadBuffer(byte *buffer, bool complete) {
//////////////////////////////////////////////////////////////////////////
bool AdGame::persist(BasePersistenceManager *persistMgr) {
- if (!persistMgr->_saving) cleanup();
+ if (!persistMgr->getIsSaving()) cleanup();
BaseGame::persist(persistMgr);
_dlgPendingBranches.persist(persistMgr);
@@ -1292,7 +1292,7 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) {
_speechDirs.persist(persistMgr);
persistMgr->transfer(TMEMBER(_smartItemCursor));
- if (!persistMgr->_saving) _initialScene = false;
+ if (!persistMgr->getIsSaving()) _initialScene = false;
persistMgr->transfer(TMEMBER(_startupScene));
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 8ed2fb3f0b..4e7c608482 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -166,7 +166,7 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_targetAlpha));
persistMgr->transfer(TMEMBER(_system));
- if (_system && !persistMgr->_saving) _startTime = 0;
+ if (_system && !persistMgr->getIsSaving()) _startTime = 0;
return STATUS_OK;
}
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index e72deb4be2..301f79691d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3547,7 +3547,7 @@ bool BaseGame::loadSettings(const char *filename) {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::persist(BasePersistenceManager *persistMgr) {
- if (!persistMgr->_saving)
+ if (!persistMgr->getIsSaving())
cleanup();
BaseObject::persist(persistMgr);
@@ -3631,7 +3631,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_autoSaveSlot));
persistMgr->transfer(TMEMBER(_cursorHidden));
- if (!persistMgr->_saving)
+ if (!persistMgr->getIsSaving())
_quitting = false;
return STATUS_OK;
diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index a12f70f3ba..db0f1db94d 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -215,7 +215,7 @@ bool BaseKeyboardState::readKey(Common::Event *event) {
//////////////////////////////////////////////////////////////////////////
bool BaseKeyboardState::persist(BasePersistenceManager *persistMgr) {
- //if(!persistMgr->_saving) cleanup();
+ //if(!persistMgr->getIsSaving()) cleanup();
BaseScriptable::persist(persistMgr);
persistMgr->transfer(TMEMBER(_currentAlt));
@@ -225,7 +225,7 @@ bool BaseKeyboardState::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_currentPrintable));
persistMgr->transfer(TMEMBER(_currentShift));
- if (!persistMgr->_saving) {
+ if (!persistMgr->getIsSaving()) {
_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum
for (int i = 0; i < 323; i++) {
_keyStates[i] = false;
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 610229644c..da38806888 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -36,6 +36,7 @@
#include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/wintermute.h"
#include "graphics/decoders/bmp.h"
#include "common/memstream.h"
#include "common/str.h"
@@ -51,7 +52,7 @@ namespace WinterMute {
#define SAVE_MAGIC_2 0x32564153
//////////////////////////////////////////////////////////////////////////
-BasePersistenceManager::BasePersistenceManager(BaseGame *inGame, const char *savePrefix): BaseClass(inGame) {
+BasePersistenceManager::BasePersistenceManager(BaseGame *inGame, const char *savePrefix) {
_saving = false;
// _buffer = NULL;
// _bufferSize = 0;
@@ -315,7 +316,7 @@ bool BasePersistenceManager::initLoad(const char *filename) {
_saving = false;
if (_savedName == "" || scumm_stricmp(_savedName.c_str(), _gameRef->getName()) != 0) {
- _gameRef->LOG(0, "ERROR: Saved game name doesn't match current game");
+ debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
cleanup();
return STATUS_FAILED;
}
@@ -325,8 +326,9 @@ bool BasePersistenceManager::initLoad(const char *filename) {
(_savedVerMajor == DCGF_VER_MAJOR && _savedVerMinor > DCGF_VER_MINOR) ||
(_savedVerMajor == DCGF_VER_MAJOR && _savedVerMinor == DCGF_VER_MINOR && _savedVerBuild > DCGF_VER_BUILD)
) {
- _gameRef->LOG(0, "ERROR: Saved game version is newer than current game");
- _gameRef->LOG(0, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+
+ debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game version is newer than current game");
+ debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
}
@@ -336,8 +338,8 @@ bool BasePersistenceManager::initLoad(const char *filename) {
(_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor < SAVEGAME_VER_MINOR) ||
(_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor == SAVEGAME_VER_MINOR && _savedVerBuild < SAVEGAME_VER_BUILD)
) {
- _gameRef->LOG(0, "ERROR: Saved game is too old and cannot be used by this version of game engine");
- _gameRef->LOG(0, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+ debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game is too old and cannot be used by this version of game engine");
+ debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
@@ -746,7 +748,7 @@ bool BasePersistenceManager::transfer(const char *name, void *val) {
if (_saving) {
SystemClassRegistry::getInstance()->getPointerID(*(void **)val, &classID, &instanceID);
if (*(void **)val != NULL && (classID == -1 || instanceID == -1)) {
- _gameRef->LOG(0, "Warning: invalid instance '%s'", name);
+ debugC(kWinterMuteDebugSaveGame, "Warning: invalid instance '%s'", name);
}
_saveStream->writeUint32LE(classID);
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index a400c612dc..a59f797668 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_BPERSISTMGR_H
-#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/math/rect32.h"
#include "engines/savestate.h"
#include "common/stream.h"
@@ -41,17 +41,10 @@
namespace WinterMute {
class Vector2;
-
-class BasePersistenceManager : public BaseClass {
+class BaseGame;
+class BasePersistenceManager {
public:
char *_savedDescription;
- TimeDate _savedTimestamp;
- uint32 _savedPlayTime;
- byte _savedVerMajor;
- byte _savedVerMinor;
- byte _savedVerBuild;
- byte _savedExtMajor;
- byte _savedExtMinor;
Common::String _savePrefix;
Common::String _savedName;
bool saveFile(const char *filename);
@@ -75,7 +68,7 @@ public:
bool putBytes(byte *buffer, uint32 size);
uint32 _offset;
- bool _saving;
+ bool getIsSaving() { return _saving; }
uint32 _richBufferSize;
byte *_richBuffer;
@@ -107,6 +100,16 @@ private:
bool putTimeDate(const TimeDate &t);
Common::WriteStream *_saveStream;
Common::SeekableReadStream *_loadStream;
+ TimeDate _savedTimestamp;
+ uint32 _savedPlayTime;
+ byte _savedVerMajor;
+ byte _savedVerMinor;
+ byte _savedVerBuild;
+ byte _savedExtMajor;
+ byte _savedExtMinor;
+ bool _saving;
+ // Separate from Base, as this class can do SOME operations without a _gameRef.
+ BaseGame *_gameRef;
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 20eb2d13e1..62ed4f67f2 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -271,7 +271,7 @@ bool BaseScriptHolder::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_filename));
persistMgr->transfer(TMEMBER(_freezable));
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
const char *name = getName();
persistMgr->transfer(TMEMBER(name));
} else {
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 8e6931f54b..0dd10f6bdc 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -147,7 +147,7 @@ bool BaseSurfaceStorage::restoreAll() {
bool BaseSurfaceStorage::persist(BasePersistenceManager *persistMgr)
{
- if(!persistMgr->_saving) cleanup(false);
+ if(!persistMgr->getIsSaving()) cleanup(false);
persistMgr->transfer(TMEMBER(_gameRef));
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 8fd13a6835..2e752d4f2e 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -463,7 +463,7 @@ bool BaseFontBitmap::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_sprite));
persistMgr->transfer(TMEMBER(_widthsFrame));
- if (persistMgr->_saving)
+ if (persistMgr->getIsSaving())
persistMgr->putBytes(_widths, sizeof(_widths));
else
persistMgr->getBytes(_widths, sizeof(_widths));
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
index 338273f338..84c80c73cb 100644
--- a/engines/wintermute/base/font/base_font_storage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -123,7 +123,7 @@ bool BaseFontStorage::removeFont(BaseFont *font) {
//////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::persist(BasePersistenceManager *persistMgr) {
- if (!persistMgr->_saving) cleanup(false);
+ if (!persistMgr->getIsSaving()) cleanup(false);
persistMgr->transfer(TMEMBER(_gameRef));
_fonts.persist(persistMgr);
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 18966c662c..c371177bac 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -606,7 +606,7 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) {
// persist layers
int numLayers;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
numLayers = _layers.getSize();
persistMgr->transfer(TMEMBER(numLayers));
for (int i = 0; i < numLayers; i++) _layers[i]->persist(persistMgr);
@@ -620,7 +620,7 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) {
}
}
- if (!persistMgr->_saving) {
+ if (!persistMgr->getIsSaving()) {
for (int i = 0; i < NUM_CACHED_TEXTS; i++) _cachedTexts[i] = NULL;
_fallbackFont = _font = _deletableFont = NULL;
}
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index bfe050cbe0..6bfff0799e 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -1161,7 +1161,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
_sprites.persist(persistMgr);
int numForces;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
numForces = _forces.getSize();
persistMgr->transfer(TMEMBER(numForces));
for (int i = 0; i < _forces.getSize(); i++) {
@@ -1177,7 +1177,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
}
int numParticles;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
numParticles = _particles.getSize();
persistMgr->transfer(TMEMBER(numParticles));
for (int i = 0; i < _particles.getSize(); i++) {
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp
index 6a8f328349..7b2f117b4f 100644
--- a/engines/wintermute/base/particles/part_force.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -47,7 +47,7 @@ PartForce::~PartForce(void) {
//////////////////////////////////////////////////////////////////////////
bool PartForce::persist(BasePersistenceManager *persistMgr) {
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
const char *name = getName();
persistMgr->transfer(TMEMBER(name));
} else {
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 37f374a3e5..b63a82f926 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -237,7 +237,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_exponentialGrowth));
persistMgr->transfer(TMEMBER(_fadeStartAlpha));
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
const char *filename = _sprite->getFilename();
persistMgr->transfer(TMEMBER(filename));
} else {
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();
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index 06421e8632..1853d7abfd 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -149,7 +149,7 @@ bool BaseSound::resume() {
//////////////////////////////////////////////////////////////////////////
bool BaseSound::persist(BasePersistenceManager *persistMgr) {
- if (persistMgr->_saving && _sound) {
+ if (persistMgr->getIsSaving() && _sound) {
_soundPlaying = _sound->isPlaying();
_soundLooping = _sound->_looping;
_soundPrivateVolume = _sound->_privateVolume;
@@ -159,7 +159,7 @@ bool BaseSound::persist(BasePersistenceManager *persistMgr) {
_soundFreezePaused = _sound->_freezePaused;
}
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
_sFXType = SFX_NONE;
_sFXParam1 = _sFXParam2 = _sFXParam3 = _sFXParam4 = 0;
}
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index 252531e4d2..d7e1ae1748 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -350,7 +350,7 @@ void BaseArray<TYPE, ARG_TYPE>::insertAt(int nStartIndex, BaseArray *pNewArray)
template<class TYPE, class ARG_TYPE>
bool BaseArray<TYPE, ARG_TYPE>::persist(BasePersistenceManager *persistMgr) {
int i, j;
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
j = getSize();
persistMgr->transfer("ArraySize", &j);
for (i = 0; i < j; i++) {
@@ -366,7 +366,7 @@ bool BaseArray<TYPE, ARG_TYPE>::persist(BasePersistenceManager *persistMgr) {
add(obj);
}
}
- return STATUS_OK;
+ return true;
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 93e45fb1ff..a6adfca374 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -1032,7 +1032,7 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_press));
persistMgr->transfer(TMEMBER(_stayPressed));
- if (!persistMgr->_saving) {
+ if (!persistMgr->getIsSaving()) {
_oneTimePress = false;
_oneTimePressTime = 0;
}
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index 3d847408b5..e687075a9a 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -844,7 +844,7 @@ bool UIEdit::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_selEnd));
persistMgr->transfer(TMEMBER(_selStart));
- if (!persistMgr->_saving) {
+ if (!persistMgr->getIsSaving()) {
_cursorVisible = false;
_lastBlinkTime = 0;
}
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 81e6769cfd..97fba01201 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -805,7 +805,7 @@ bool VideoTheoraPlayer::resume() {
bool VideoTheoraPlayer::persist(BasePersistenceManager *persistMgr) {
//BaseClass::persist(persistMgr);
- if (persistMgr->_saving) {
+ if (persistMgr->getIsSaving()) {
_savedPos = getMovieTime() * 1000;
_savedState = _state;
} else {
@@ -824,7 +824,7 @@ bool VideoTheoraPlayer::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_looping));
persistMgr->transfer(TMEMBER(_volume));
- if (!persistMgr->_saving && (_savedState != THEORA_STATE_NONE)) {
+ if (!persistMgr->getIsSaving() && (_savedState != THEORA_STATE_NONE)) {
initializeSimple();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:01:44 +0000