From 4c3c7076710bd27bbcb57ea5ccdd343d4d99699b Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 29 Oct 2013 01:44:08 +0100
Subject: WINTERMUTE: Transfer Doubles explicitly when saving/loading.

---
 engines/wintermute/ad/ad_actor.cpp                   | 8 ++++----
 engines/wintermute/base/base_persistence_manager.cpp | 2 +-
 engines/wintermute/base/base_persistence_manager.h   | 2 +-
 engines/wintermute/base/scriptables/script_value.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/wintermute')

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 3212388f68..590d7c4f01 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -1322,10 +1322,10 @@ bool AdActor::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER_INT(_dir));
 	persistMgr->transferPtr(TMEMBER_PTR(_path));
 	persistMgr->transfer(TMEMBER(_pFCount));
-	persistMgr->transfer(TMEMBER(_pFStepX));
-	persistMgr->transfer(TMEMBER(_pFStepY));
-	persistMgr->transfer(TMEMBER(_pFX));
-	persistMgr->transfer(TMEMBER(_pFY));
+	persistMgr->transferDouble(TMEMBER(_pFStepX));
+	persistMgr->transferDouble(TMEMBER(_pFStepY));
+	persistMgr->transferDouble(TMEMBER(_pFX));
+	persistMgr->transferDouble(TMEMBER(_pFY));
 	persistMgr->transferPtr(TMEMBER_PTR(_standSprite));
 	_talkSprites.persist(persistMgr);
 	_talkSpritesEx.persist(persistMgr);
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index a5da8c1757..1caa0ad20b 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -663,7 +663,7 @@ bool BasePersistenceManager::transferFloat(const char *name, float *val) {
 
 //////////////////////////////////////////////////////////////////////////
 // double
-bool BasePersistenceManager::transfer(const char *name, double *val) {
+bool BasePersistenceManager::transferDouble(const char *name, double *val) {
 	if (_saving) {
 		putDouble(*val);
 		if (_saveStream->err()) {
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 3bac07ea9d..03316d9d19 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -77,7 +77,7 @@ public:
 	bool transfer(const char *name, int32 *val);
 	bool transfer(const char *name, uint32 *val);
 	bool transferFloat(const char *name, float *val);
-	bool transfer(const char *name, double *val);
+	bool transferDouble(const char *name, double *val);
 	bool transferBool(const char *name, bool *val);
 	bool transferByte(const char *name, byte *val);
 	bool transferRect32(const char *name, Rect32 *val);
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index c87180f049..5b275746c0 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -795,7 +795,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_isConstVar));
 	persistMgr->transfer(TMEMBER_INT(_type));
 	persistMgr->transferBool(TMEMBER(_valBool));
-	persistMgr->transfer(TMEMBER(_valFloat));
+	persistMgr->transferDouble(TMEMBER(_valFloat));
 	persistMgr->transfer(TMEMBER(_valInt));
 	persistMgr->transferPtr(TMEMBER_PTR(_valNative));
 
-- 
cgit v1.2.3