aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/particles
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-10-28 19:19:12 +0100
committerEinar Johan Trøan Sømåen2013-10-28 19:19:12 +0100
commit6b4adab654461646a3873b7ad39a283feeb29037 (patch)
treeb0e0661a1ff1d1f89d6b18c08351cad066dc9510 /engines/wintermute/base/particles
parentba17ed94903d183b7f1810179db01ffb40bd530d (diff)
downloadscummvm-rg350-6b4adab654461646a3873b7ad39a283feeb29037.tar.gz
scummvm-rg350-6b4adab654461646a3873b7ad39a283feeb29037.tar.bz2
scummvm-rg350-6b4adab654461646a3873b7ad39a283feeb29037.zip
WINTERMUTE: Transfer booleans explicitly when saving/loading.
Diffstat (limited to 'engines/wintermute/base/particles')
-rw-r--r--engines/wintermute/base/particles/part_emitter.cpp14
-rw-r--r--engines/wintermute/base/particles/part_particle.cpp4
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index aaffa0965a..79076d78b6 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -1165,22 +1165,22 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferFloat(TMEMBER(_velocity1));
persistMgr->transferFloat(TMEMBER(_velocity2));
- persistMgr->transfer(TMEMBER(_velocityZBased));
+ persistMgr->transferBool(TMEMBER(_velocityZBased));
persistMgr->transferFloat(TMEMBER(_scale1));
persistMgr->transferFloat(TMEMBER(_scale2));
- persistMgr->transfer(TMEMBER(_scaleZBased));
+ persistMgr->transferBool(TMEMBER(_scaleZBased));
persistMgr->transfer(TMEMBER(_maxParticles));
persistMgr->transfer(TMEMBER(_lifeTime1));
persistMgr->transfer(TMEMBER(_lifeTime2));
- persistMgr->transfer(TMEMBER(_lifeTimeZBased));
+ persistMgr->transferBool(TMEMBER(_lifeTimeZBased));
persistMgr->transfer(TMEMBER(_genInterval));
persistMgr->transfer(TMEMBER(_genAmount));
- persistMgr->transfer(TMEMBER(_running));
+ persistMgr->transferBool(TMEMBER(_running));
persistMgr->transfer(TMEMBER(_overheadTime));
persistMgr->transfer(TMEMBER(_border));
@@ -1194,7 +1194,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
persistMgr->transfer(TMEMBER(_alpha1));
persistMgr->transfer(TMEMBER(_alpha2));
- persistMgr->transfer(TMEMBER(_alphaTimeBased));
+ persistMgr->transferBool(TMEMBER(_alphaTimeBased));
persistMgr->transferFloat(TMEMBER(_angVelocity1));
persistMgr->transferFloat(TMEMBER(_angVelocity2));
@@ -1204,9 +1204,9 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferFloat(TMEMBER(_growthRate1));
persistMgr->transferFloat(TMEMBER(_growthRate2));
- persistMgr->transfer(TMEMBER(_exponentialGrowth));
+ persistMgr->transferBool(TMEMBER(_exponentialGrowth));
- persistMgr->transfer(TMEMBER(_useRegion));
+ persistMgr->transferBool(TMEMBER(_useRegion));
persistMgr->transfer(TMEMBER_INT(_maxBatches));
persistMgr->transfer(TMEMBER_INT(_batchesGenerated));
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 86cacacb5c..e857458ae9 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -239,7 +239,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferFloat(TMEMBER(_scale));
persistMgr->transfer(TMEMBER(_creationTime));
persistMgr->transfer(TMEMBER(_lifeTime));
- persistMgr->transfer(TMEMBER(_isDead));
+ persistMgr->transferBool(TMEMBER(_isDead));
persistMgr->transfer(TMEMBER_INT(_state));
persistMgr->transfer(TMEMBER(_fadeStart));
persistMgr->transfer(TMEMBER(_fadeTime));
@@ -247,7 +247,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferFloat(TMEMBER(_angVelocity));
persistMgr->transferFloat(TMEMBER(_rotation));
persistMgr->transferFloat(TMEMBER(_growthRate));
- persistMgr->transfer(TMEMBER(_exponentialGrowth));
+ persistMgr->transferBool(TMEMBER(_exponentialGrowth));
persistMgr->transfer(TMEMBER(_fadeStartAlpha));
if (persistMgr->getIsSaving()) {