From 4e2bec5311c3f1cad1beb21d5c46539fdc8a7747 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 5 Nov 2013 13:58:02 +0100
Subject: WINTERMUTE: Transfer Const Char* explicitly when saving/loading.

---
 engines/wintermute/base/base_persistence_manager.cpp | 2 +-
 engines/wintermute/base/base_persistence_manager.h   | 2 +-
 engines/wintermute/base/base_script_holder.cpp       | 2 +-
 engines/wintermute/base/particles/part_force.cpp     | 4 ++--
 engines/wintermute/base/particles/part_particle.cpp  | 2 +-
 engines/wintermute/base/scriptables/script_value.cpp | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/wintermute/base')

diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index b9f52b286d..97907dead7 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -699,7 +699,7 @@ bool BasePersistenceManager::transferCharPtr(const char *name, char **val) {
 
 //////////////////////////////////////////////////////////////////////////
 // const char*
-bool BasePersistenceManager::transfer(const char *name, const char **val) {
+bool BasePersistenceManager::transferConstChar(const char *name, const char **val) {
 	if (_saving) {
 		putString(*val);
 		return STATUS_OK;
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 2735e2bd01..2cb360e4af 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -82,7 +82,7 @@ public:
 	bool transferByte(const char *name, byte *val);
 	bool transferRect32(const char *name, Rect32 *val);
 	bool transferPoint32(const char *name, Point32 *val);
-	bool transfer(const char *name, const char **val);
+	bool transferConstChar(const char *name, const char **val);
 	bool transferCharPtr(const char *name, char **val);
 	bool transfer(const char *name, Common::String *val);
 	bool transferVector2(const char *name, Vector2 *val);
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index d59aac44c5..5fb0b62713 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -284,7 +284,7 @@ bool BaseScriptHolder::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_freezable));
 	if (persistMgr->getIsSaving()) {
 		const char *name = getName();
-		persistMgr->transfer(TMEMBER(name));
+		persistMgr->transferConstChar(TMEMBER(name));
 	} else {
 		char *name;
 		persistMgr->transferCharPtr(TMEMBER(name));
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp
index 4355e654c0..39d98c182e 100644
--- a/engines/wintermute/base/particles/part_force.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -49,10 +49,10 @@ PartForce::~PartForce(void) {
 bool PartForce::persist(BasePersistenceManager *persistMgr) {
 	if (persistMgr->getIsSaving()) {
 		const char *name = getName();
-		persistMgr->transfer(TMEMBER(name));
+		persistMgr->transferConstChar(TMEMBER(name));
 	} else {
 		const char *name;
-		persistMgr->transfer(TMEMBER(name));
+		persistMgr->transferConstChar(TMEMBER(name));
 		setName(name);
 	}
 	persistMgr->transferVector2(TMEMBER(_pos));
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 5ba1a70240..11470561f0 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -252,7 +252,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
 
 	if (persistMgr->getIsSaving()) {
 		const char *filename = _sprite->getFilename();
-		persistMgr->transfer(TMEMBER(filename));
+		persistMgr->transferConstChar(TMEMBER(filename));
 	} else {
 		char *filename;
 		persistMgr->transferCharPtr(TMEMBER(filename));
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index e0c8609b0f..52367646a5 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -807,7 +807,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 		_valIter = _valObject.begin();
 		while (_valIter != _valObject.end()) {
 			str = _valIter->_key.c_str();
-			persistMgr->transfer("", &str);
+			persistMgr->transferConstChar("", &str);
 			persistMgr->transferPtr("", &_valIter->_value);
 
 			_valIter++;
@@ -816,7 +816,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 		ScValue *val = nullptr;
 		persistMgr->transferSint32("", &size);
 		for (int i = 0; i < size; i++) {
-			persistMgr->transfer("", &str);
+			persistMgr->transferConstChar("", &str);
 			persistMgr->transferPtr("", &val);
 
 			_valObject[str] = val;
-- 
cgit v1.2.3