diff options
| author | Einar Johan Trøan Sømåen | 2013-10-29 01:02:54 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-29 02:59:52 +0100 |
| commit | 047a7171ee5e5286d6e13594c9cb60056dff454d (patch) | |
| tree | 95d5c8bd3998e0e066653a0a675cb5eed9f9fed1 /engines/wintermute | |
| parent | ee5adb84c58e27868e3ac4f7248f543095206564 (diff) | |
| download | scummvm-rg350-047a7171ee5e5286d6e13594c9cb60056dff454d.tar.gz scummvm-rg350-047a7171ee5e5286d6e13594c9cb60056dff454d.tar.bz2 scummvm-rg350-047a7171ee5e5286d6e13594c9cb60056dff454d.zip | |
WINTERMUTE: Transfer Vector2s explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute')
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index aa3c7a1467..766e381422 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -834,7 +834,7 @@ bool BasePersistenceManager::transfer(const char *name, Point32 *val) { ////////////////////////////////////////////////////////////////////////// // Vector2 -bool BasePersistenceManager::transfer(const char *name, Vector2 *val) { +bool BasePersistenceManager::transferVector2(const char *name, Vector2 *val) { if (_saving) { putFloat(val->x); putFloat(val->y); diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 80fc6fde8c..d1569fccf6 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -85,7 +85,7 @@ public: bool transfer(const char *name, const char **val); bool transfer(const char *name, char **val); bool transfer(const char *name, Common::String *val); - bool transfer(const char *name, Vector2 *val); + bool transferVector2(const char *name, Vector2 *val); bool transfer(const char *name, AnsiStringArray &Val); BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); virtual ~BasePersistenceManager(); diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp index 122cdf1afe..e7583e554a 100644 --- a/engines/wintermute/base/particles/part_force.cpp +++ b/engines/wintermute/base/particles/part_force.cpp @@ -55,8 +55,8 @@ bool PartForce::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(name)); setName(name); } - persistMgr->transfer(TMEMBER(_pos)); - persistMgr->transfer(TMEMBER(_direction)); + persistMgr->transferVector2(TMEMBER(_pos)); + persistMgr->transferVector2(TMEMBER(_direction)); persistMgr->transfer(TMEMBER_INT(_type)); return STATUS_OK; diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index e857458ae9..c35ebd6f50 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -233,9 +233,9 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer(TMEMBER(_alpha1)); persistMgr->transfer(TMEMBER(_alpha2)); persistMgr->transfer(TMEMBER(_border)); - persistMgr->transfer(TMEMBER(_pos)); + persistMgr->transferVector2(TMEMBER(_pos)); persistMgr->transferFloat(TMEMBER(_posZ)); - persistMgr->transfer(TMEMBER(_velocity)); + persistMgr->transferVector2(TMEMBER(_velocity)); persistMgr->transferFloat(TMEMBER(_scale)); persistMgr->transfer(TMEMBER(_creationTime)); persistMgr->transfer(TMEMBER(_lifeTime)); |