diff options
| author | Einar Johan Trøan Sømåen | 2013-10-29 00:56:57 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-29 02:59:52 +0100 |
| commit | ee5adb84c58e27868e3ac4f7248f543095206564 (patch) | |
| tree | 3eb9856fe36aa9baae35ff29c5f22fd047fb9a22 /engines/wintermute | |
| parent | 1873246a711ab806804d633e738a706cb2a0d015 (diff) | |
| download | scummvm-rg350-ee5adb84c58e27868e3ac4f7248f543095206564.tar.gz scummvm-rg350-ee5adb84c58e27868e3ac4f7248f543095206564.tar.bz2 scummvm-rg350-ee5adb84c58e27868e3ac4f7248f543095206564.zip | |
WINTERMUTE: Transfer bytes explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/base/base_fader.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index a2408b619c..b5590abb08 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -176,14 +176,14 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) { BaseObject::persist(persistMgr); persistMgr->transferBool(TMEMBER(_active)); - persistMgr->transfer(TMEMBER(_blue)); - persistMgr->transfer(TMEMBER(_currentAlpha)); + persistMgr->transferByte(TMEMBER(_blue)); + persistMgr->transferByte(TMEMBER(_currentAlpha)); persistMgr->transfer(TMEMBER(_duration)); - persistMgr->transfer(TMEMBER(_green)); - persistMgr->transfer(TMEMBER(_red)); - persistMgr->transfer(TMEMBER(_sourceAlpha)); + persistMgr->transferByte(TMEMBER(_green)); + persistMgr->transferByte(TMEMBER(_red)); + persistMgr->transferByte(TMEMBER(_sourceAlpha)); persistMgr->transfer(TMEMBER(_startTime)); - persistMgr->transfer(TMEMBER(_targetAlpha)); + persistMgr->transferByte(TMEMBER(_targetAlpha)); persistMgr->transferBool(TMEMBER(_system)); if (_system && !persistMgr->getIsSaving()) { diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index c7f672b89b..aa3c7a1467 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -769,7 +769,7 @@ bool BasePersistenceManager::transfer(const char *name, AnsiStringArray &val) { ////////////////////////////////////////////////////////////////////////// // BYTE -bool BasePersistenceManager::transfer(const char *name, byte *val) { +bool BasePersistenceManager::transferByte(const char *name, byte *val) { if (_saving) { _saveStream->writeByte(*val); if (_saveStream->err()) { diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index a168f5f964..80fc6fde8c 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -79,7 +79,7 @@ public: bool transferFloat(const char *name, float *val); bool transfer(const char *name, double *val); bool transferBool(const char *name, bool *val); - bool transfer(const char *name, byte *val); + bool transferByte(const char *name, byte *val); bool transfer(const char *name, Rect32 *val); bool transfer(const char *name, Point32 *val); bool transfer(const char *name, const char **val); diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 1327ae16d6..be85616250 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -398,9 +398,9 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_surfaceFilename)); persistMgr->transferBool(TMEMBER(_cKDefault)); - persistMgr->transfer(TMEMBER(_cKRed)); - persistMgr->transfer(TMEMBER(_cKGreen)); - persistMgr->transfer(TMEMBER(_cKBlue)); + persistMgr->transferByte(TMEMBER(_cKRed)); + persistMgr->transferByte(TMEMBER(_cKGreen)); + persistMgr->transferByte(TMEMBER(_cKBlue)); persistMgr->transfer(TMEMBER(_lifeTime)); persistMgr->transferBool(TMEMBER(_keepLoaded)); |