diff options
author | Einar Johan Trøan Sømåen | 2013-11-05 13:31:13 +0100 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-11-05 13:31:13 +0100 |
commit | 7892188bcf45ec7eaeee9eed1c92b84839c1224b (patch) | |
tree | ee5f50d1bf8b1b4247ce38dbdffa226023933b31 /engines/wintermute/base/particles | |
parent | e03f0f1e924d238f01d297ef1e7bcdbd264ae2aa (diff) | |
download | scummvm-rg350-7892188bcf45ec7eaeee9eed1c92b84839c1224b.tar.gz scummvm-rg350-7892188bcf45ec7eaeee9eed1c92b84839c1224b.tar.bz2 scummvm-rg350-7892188bcf45ec7eaeee9eed1c92b84839c1224b.zip |
WINTERMUTE: Transfer Uint32s explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute/base/particles')
-rw-r--r-- | engines/wintermute/base/particles/part_emitter.cpp | 8 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index c5c049a37c..bd59a7a667 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -1219,12 +1219,12 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) { uint32 numForces; if (persistMgr->getIsSaving()) { numForces = _forces.size(); - persistMgr->transfer(TMEMBER(numForces)); + persistMgr->transferUint32(TMEMBER(numForces)); for (uint32 i = 0; i < _forces.size(); i++) { _forces[i]->persist(persistMgr); } } else { - persistMgr->transfer(TMEMBER(numForces)); + persistMgr->transferUint32(TMEMBER(numForces)); for (uint32 i = 0; i < numForces; i++) { PartForce *force = new PartForce(_gameRef); force->persist(persistMgr); @@ -1235,12 +1235,12 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) { uint32 numParticles; if (persistMgr->getIsSaving()) { numParticles = _particles.size(); - persistMgr->transfer(TMEMBER(numParticles)); + persistMgr->transferUint32(TMEMBER(numParticles)); for (uint32 i = 0; i < _particles.size(); i++) { _particles[i]->persist(persistMgr); } } else { - persistMgr->transfer(TMEMBER(numParticles)); + persistMgr->transferUint32(TMEMBER(numParticles)); for (uint32 i = 0; i < numParticles; i++) { PartParticle *particle = new PartParticle(_gameRef); particle->persist(persistMgr); diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index c5bf0f8326..62faf73e7e 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -237,11 +237,11 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) { persistMgr->transferFloat(TMEMBER(_posZ)); persistMgr->transferVector2(TMEMBER(_velocity)); persistMgr->transferFloat(TMEMBER(_scale)); - persistMgr->transfer(TMEMBER(_creationTime)); + persistMgr->transferUint32(TMEMBER(_creationTime)); persistMgr->transfer(TMEMBER(_lifeTime)); persistMgr->transferBool(TMEMBER(_isDead)); persistMgr->transfer(TMEMBER_INT(_state)); - persistMgr->transfer(TMEMBER(_fadeStart)); + persistMgr->transferUint32(TMEMBER(_fadeStart)); persistMgr->transfer(TMEMBER(_fadeTime)); persistMgr->transfer(TMEMBER(_currentAlpha)); persistMgr->transferFloat(TMEMBER(_angVelocity)); |