From 9f2c5385ba232c0cc086f3c914b5f98463df330d Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 22 Jun 2012 20:06:12 +0200
Subject: WINTERMUTE: Rename Persist->persist

---
 engines/wintermute/Base/BFader.cpp                  |  4 ++--
 engines/wintermute/Base/BFont.cpp                   |  4 ++--
 engines/wintermute/Base/BFontBitmap.cpp             |  4 ++--
 engines/wintermute/Base/BFontStorage.cpp            |  4 ++--
 engines/wintermute/Base/BFontTT.cpp                 |  8 ++++----
 engines/wintermute/Base/BFontTT.h                   |  2 +-
 engines/wintermute/Base/BFrame.cpp                  |  8 ++++----
 engines/wintermute/Base/BGame.cpp                   |  8 ++++----
 engines/wintermute/Base/BKeyboardState.cpp          |  4 ++--
 engines/wintermute/Base/BObject.cpp                 |  4 ++--
 engines/wintermute/Base/BPersistMgr.cpp             | 10 +++++-----
 engines/wintermute/Base/BPoint.cpp                  |  2 +-
 engines/wintermute/Base/BRegion.cpp                 |  6 +++---
 engines/wintermute/Base/BScriptHolder.cpp           |  6 +++---
 engines/wintermute/Base/BScriptable.cpp             |  2 +-
 engines/wintermute/Base/BSound.cpp                  |  2 +-
 engines/wintermute/Base/BSprite.cpp                 |  6 +++---
 engines/wintermute/Base/BSubFrame.cpp               |  4 ++--
 engines/wintermute/Base/BSurfaceStorage.cpp         |  4 ++--
 engines/wintermute/Base/BViewport.cpp               |  2 +-
 engines/wintermute/Base/PartEmitter.cpp             | 14 +++++++-------
 engines/wintermute/Base/PartForce.cpp               |  2 +-
 engines/wintermute/Base/PartForce.h                 |  2 +-
 engines/wintermute/Base/PartParticle.cpp            |  2 +-
 engines/wintermute/Base/PartParticle.h              |  2 +-
 engines/wintermute/Base/scriptables/SXArray.cpp     |  4 ++--
 engines/wintermute/Base/scriptables/SXDate.cpp      |  4 ++--
 engines/wintermute/Base/scriptables/SXFile.cpp      |  4 ++--
 engines/wintermute/Base/scriptables/SXMath.cpp      |  4 ++--
 engines/wintermute/Base/scriptables/SXMemBuffer.cpp |  4 ++--
 engines/wintermute/Base/scriptables/SXStore.cpp     |  8 ++++----
 engines/wintermute/Base/scriptables/SXStore.h       |  2 +-
 engines/wintermute/Base/scriptables/SXString.cpp    |  4 ++--
 engines/wintermute/Base/scriptables/ScEngine.cpp    |  4 ++--
 engines/wintermute/Base/scriptables/ScScript.cpp    |  2 +-
 engines/wintermute/Base/scriptables/ScStack.cpp     |  4 ++--
 engines/wintermute/Base/scriptables/ScValue.cpp     |  2 +-
 engines/wintermute/Base/scriptables/SxObject.cpp    |  4 ++--
 38 files changed, 83 insertions(+), 83 deletions(-)

(limited to 'engines/wintermute/Base')

diff --git a/engines/wintermute/Base/BFader.cpp b/engines/wintermute/Base/BFader.cpp
index a00215158c..cd78ece27a 100644
--- a/engines/wintermute/Base/BFader.cpp
+++ b/engines/wintermute/Base/BFader.cpp
@@ -154,8 +154,8 @@ uint32 CBFader::GetCurrentColor() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFader::Persist(CBPersistMgr *persistMgr) {
-	CBObject::Persist(persistMgr);
+HRESULT CBFader::persist(CBPersistMgr *persistMgr) {
+	CBObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_blue));
diff --git a/engines/wintermute/Base/BFont.cpp b/engines/wintermute/Base/BFont.cpp
index 302d4728d0..28317b00ce 100644
--- a/engines/wintermute/Base/BFont.cpp
+++ b/engines/wintermute/Base/BFont.cpp
@@ -144,9 +144,9 @@ int CBFont::GetLetterHeight() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFont::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBFont::persist(CBPersistMgr *persistMgr) {
 
-	CBObject::Persist(persistMgr);
+	CBObject::persist(persistMgr);
 	return S_OK;
 }
 
diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 94f723cef3..5db8e34a08 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -456,9 +456,9 @@ HRESULT CBFontBitmap::LoadBuffer(byte  *Buffer) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFontBitmap::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBFontBitmap::persist(CBPersistMgr *persistMgr) {
 
-	CBFont::Persist(persistMgr);
+	CBFont::persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_numColumns));
 
 	persistMgr->transfer(TMEMBER(_subframe));
diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp
index a96809d194..a6ad5fb6a6 100644
--- a/engines/wintermute/Base/BFontStorage.cpp
+++ b/engines/wintermute/Base/BFontStorage.cpp
@@ -142,12 +142,12 @@ HRESULT CBFontStorage::RemoveFont(CBFont *Font) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFontStorage::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBFontStorage::persist(CBPersistMgr *persistMgr) {
 
 	if (!persistMgr->_saving) Cleanup(false);
 
 	persistMgr->transfer(TMEMBER(Game));
-	_fonts.Persist(persistMgr);
+	_fonts.persist(persistMgr);
 
 	if (!persistMgr->_saving) InitFreeType();
 
diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index 0d2f39f730..d7ab99a026 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -592,8 +592,8 @@ HRESULT CBFontTT::ParseLayer(CBTTFontLayer *Layer, byte *Buffer) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFontTT::Persist(CBPersistMgr *persistMgr) {
-	CBFont::Persist(persistMgr);
+HRESULT CBFontTT::persist(CBPersistMgr *persistMgr) {
+	CBFont::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_isBold));
 	persistMgr->transfer(TMEMBER(_isItalic));
@@ -608,13 +608,13 @@ HRESULT CBFontTT::Persist(CBPersistMgr *persistMgr) {
 	if (persistMgr->_saving) {
 		NumLayers = _layers.GetSize();
 		persistMgr->transfer(TMEMBER(NumLayers));
-		for (int i = 0; i < NumLayers; i++) _layers[i]->Persist(persistMgr);
+		for (int i = 0; i < NumLayers; i++) _layers[i]->persist(persistMgr);
 	} else {
 		NumLayers = _layers.GetSize();
 		persistMgr->transfer(TMEMBER(NumLayers));
 		for (int i = 0; i < NumLayers; i++) {
 			CBTTFontLayer *Layer = new CBTTFontLayer;
-			Layer->Persist(persistMgr);
+			Layer->persist(persistMgr);
 			_layers.Add(Layer);
 		}
 	}
diff --git a/engines/wintermute/Base/BFontTT.h b/engines/wintermute/Base/BFontTT.h
index 418efb3e9b..db5b029c93 100644
--- a/engines/wintermute/Base/BFontTT.h
+++ b/engines/wintermute/Base/BFontTT.h
@@ -80,7 +80,7 @@ public:
 			_color = 0x00000000;
 		}
 
-		HRESULT Persist(CBPersistMgr *persistMgr) {
+		HRESULT persist(CBPersistMgr *persistMgr) {
 			persistMgr->transfer(TMEMBER(_offsetX));
 			persistMgr->transfer(TMEMBER(_offsetY));
 			persistMgr->transfer(TMEMBER(_color));
diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index 9e07407f26..1f14c4ea8f 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -381,10 +381,10 @@ HRESULT CBFrame::SaveAsText(CBDynBuffer *Buffer, int Indent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBFrame::Persist(CBPersistMgr *persistMgr) {
-	CBScriptable::Persist(persistMgr);
+HRESULT CBFrame::persist(CBPersistMgr *persistMgr) {
+	CBScriptable::persist(persistMgr);
 
-	_applyEvent.Persist(persistMgr);
+	_applyEvent.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_delay));
 	persistMgr->transfer(TMEMBER(_editorExpanded));
 	persistMgr->transfer(TMEMBER(_keyframe));
@@ -392,7 +392,7 @@ HRESULT CBFrame::Persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_moveX));
 	persistMgr->transfer(TMEMBER(_moveY));
 	persistMgr->transfer(TMEMBER(_sound));
-	_subframes.Persist(persistMgr);
+	_subframes.persist(persistMgr);
 
 	return S_OK;
 }
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index def8c5137e..9544f1552e 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -3629,10 +3629,10 @@ HRESULT CBGame::LoadSettings(const char *Filename) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBGame::persist(CBPersistMgr *persistMgr) {
 	if (!persistMgr->_saving) Cleanup();
 
-	CBObject::Persist(persistMgr);
+	CBObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_activeObject));
 	persistMgr->transfer(TMEMBER(_capturedObject));
@@ -3662,7 +3662,7 @@ HRESULT CBGame::Persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_personalizedSave));
 	persistMgr->transfer(TMEMBER(_quitting));
 
-	_regObjects.Persist(persistMgr);
+	_regObjects.persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_scEngine));
 	//persistMgr->transfer(TMEMBER(_soundMgr));
@@ -3704,7 +3704,7 @@ HRESULT CBGame::Persist(CBPersistMgr *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(_mouseLockRect));
 
-	_windows.Persist(persistMgr);
+	_windows.persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_suppressScriptErrors));
 	persistMgr->transfer(TMEMBER(_autorunDisabled));
diff --git a/engines/wintermute/Base/BKeyboardState.cpp b/engines/wintermute/Base/BKeyboardState.cpp
index 3f5d9b1225..2d95c34d4f 100644
--- a/engines/wintermute/Base/BKeyboardState.cpp
+++ b/engines/wintermute/Base/BKeyboardState.cpp
@@ -215,9 +215,9 @@ HRESULT CBKeyboardState::ReadKey(Common::Event *event) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBKeyboardState::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBKeyboardState::persist(CBPersistMgr *persistMgr) {
 	//if(!persistMgr->_saving) Cleanup();
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_currentAlt));
 	persistMgr->transfer(TMEMBER(_currentCharCode));
diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp
index f59978eb77..66de667645 100644
--- a/engines/wintermute/Base/BObject.cpp
+++ b/engines/wintermute/Base/BObject.cpp
@@ -864,8 +864,8 @@ HRESULT CBObject::SaveAsText(CBDynBuffer *Buffer, int Indent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::Persist(CBPersistMgr *persistMgr) {
-	CBScriptHolder::Persist(persistMgr);
+HRESULT CBObject::persist(CBPersistMgr *persistMgr) {
+	CBScriptHolder::persist(persistMgr);
 
 	for (int i = 0; i < 7; i++) persistMgr->transfer(TMEMBER(_caption[i]));
 	persistMgr->transfer(TMEMBER(_activeCursor));
diff --git a/engines/wintermute/Base/BPersistMgr.cpp b/engines/wintermute/Base/BPersistMgr.cpp
index 795d7e3d03..64cbb76277 100644
--- a/engines/wintermute/Base/BPersistMgr.cpp
+++ b/engines/wintermute/Base/BPersistMgr.cpp
@@ -206,7 +206,7 @@ HRESULT CBPersistMgr::initSave(const char *desc) {
 		putString(Game->_name);
 
 		// thumbnail data size
-		bool ThumbnailOK = false;
+		bool thumbnailOK = false;
 
 		if (Game->_cachedThumbnail) {
 			if (Game->_cachedThumbnail->_thumbnail) {
@@ -218,10 +218,10 @@ HRESULT CBPersistMgr::initSave(const char *desc) {
 					_saveStream->writeUint32LE(0);
 				}
 
-				ThumbnailOK = true;
+				thumbnailOK = true;
 			}
 		}
-		if (!ThumbnailOK) putDWORD(0);
+		if (!thumbnailOK) putDWORD(0);
 
 		// in any case, destroy the cached thumbnail once used
 		delete Game->_cachedThumbnail;
@@ -281,13 +281,13 @@ HRESULT CBPersistMgr::readHeader(const Common::String &filename) {
 				}
 			} else _savedVerBuild = 35; // last build with ver1 savegames
 
-			uint32 DataOffset = getDWORD();
+			uint32 dataOffset = getDWORD();
 
 			_savedDescription = getString();
 			_savedTimestamp = getTimeDate();
 			_savedPlayTime = _loadStream->readUint32LE();
 
-			_offset = DataOffset;
+			_offset = dataOffset;
 
 			return S_OK;
 		}
diff --git a/engines/wintermute/Base/BPoint.cpp b/engines/wintermute/Base/BPoint.cpp
index 105159cb6c..92cfccd87a 100644
--- a/engines/wintermute/Base/BPoint.cpp
+++ b/engines/wintermute/Base/BPoint.cpp
@@ -53,7 +53,7 @@ CBPoint::CBPoint(int initX, int initY) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBPoint::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBPoint::persist(CBPersistMgr *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(x));
 	persistMgr->transfer(TMEMBER(y));
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index f7d3f5b2ef..355070ba26 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -406,16 +406,16 @@ HRESULT CBRegion::SaveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOv
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBRegion::persist(CBPersistMgr *persistMgr) {
 
-	CBObject::Persist(persistMgr);
+	CBObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_editorSelectedPoint));
 	persistMgr->transfer(TMEMBER(_lastMimicScale));
 	persistMgr->transfer(TMEMBER(_lastMimicX));
 	persistMgr->transfer(TMEMBER(_lastMimicY));
-	_points.Persist(persistMgr);
+	_points.persist(persistMgr);
 
 	return S_OK;
 }
diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp
index efe8e5f195..0dfeab4b07 100644
--- a/engines/wintermute/Base/BScriptHolder.cpp
+++ b/engines/wintermute/Base/BScriptHolder.cpp
@@ -263,13 +263,13 @@ HRESULT CBScriptHolder::SaveAsText(CBDynBuffer *Buffer, int Indent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptHolder::Persist(CBPersistMgr *persistMgr) {
-	CBScriptable::Persist(persistMgr);
+HRESULT CBScriptHolder::persist(CBPersistMgr *persistMgr) {
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_filename));
 	persistMgr->transfer(TMEMBER(_freezable));
 	persistMgr->transfer(TMEMBER(_name));
-	_scripts.Persist(persistMgr);
+	_scripts.persist(persistMgr);
 
 	return S_OK;
 }
diff --git a/engines/wintermute/Base/BScriptable.cpp b/engines/wintermute/Base/BScriptable.cpp
index 715a1fef8c..09a8f2c0aa 100644
--- a/engines/wintermute/Base/BScriptable.cpp
+++ b/engines/wintermute/Base/BScriptable.cpp
@@ -139,7 +139,7 @@ void CBScriptable::ScSetBool(bool Val) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptable::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBScriptable::persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(Game));
 	persistMgr->transfer(TMEMBER(_refCount));
 	persistMgr->transfer(TMEMBER(_scProp));
diff --git a/engines/wintermute/Base/BSound.cpp b/engines/wintermute/Base/BSound.cpp
index 9a48484bfe..477c44dba3 100644
--- a/engines/wintermute/Base/BSound.cpp
+++ b/engines/wintermute/Base/BSound.cpp
@@ -147,7 +147,7 @@ HRESULT CBSound::Resume() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBSound::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBSound::persist(CBPersistMgr *persistMgr) {
 	if (persistMgr->_saving && _sound) {
 		_soundPlaying = _sound->IsPlaying();
 		_soundLooping = _sound->_looping;
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 6ebaa0fa7b..f4f6e8b232 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -472,8 +472,8 @@ HRESULT CBSprite::SaveAsText(CBDynBuffer *Buffer, int Indent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBSprite::Persist(CBPersistMgr *persistMgr) {
-	CBScriptHolder::Persist(persistMgr);
+HRESULT CBSprite::persist(CBPersistMgr *persistMgr) {
+	CBScriptHolder::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_canBreak));
 	persistMgr->transfer(TMEMBER(_changed));
@@ -488,7 +488,7 @@ HRESULT CBSprite::Persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_editorMuted));
 	persistMgr->transfer(TMEMBER(_finished));
 
-	_frames.Persist(persistMgr);
+	_frames.persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_lastFrameTime));
 	persistMgr->transfer(TMEMBER(_looping));
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index ce7ffa3e9a..5ab1a10a9b 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -310,9 +310,9 @@ void CBSubFrame::SetDefaultRect() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBSubFrame::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBSubFrame::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_2DOnly));
 	persistMgr->transfer(TMEMBER(_3DOnly));
diff --git a/engines/wintermute/Base/BSurfaceStorage.cpp b/engines/wintermute/Base/BSurfaceStorage.cpp
index c5980719d7..797c5f3d49 100644
--- a/engines/wintermute/Base/BSurfaceStorage.cpp
+++ b/engines/wintermute/Base/BSurfaceStorage.cpp
@@ -148,14 +148,14 @@ HRESULT CBSurfaceStorage::RestoreAll() {
 
 /*
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBSurfaceStorage::Persist(CBPersistMgr *persistMgr)
+HRESULT CBSurfaceStorage::persist(CBPersistMgr *persistMgr)
 {
 
     if(!persistMgr->_saving) Cleanup(false);
 
     persistMgr->transfer(TMEMBER(Game));
 
-    //_surfaces.Persist(persistMgr);
+    //_surfaces.persist(persistMgr);
 
     return S_OK;
 }
diff --git a/engines/wintermute/Base/BViewport.cpp b/engines/wintermute/Base/BViewport.cpp
index eef044bb50..5010b2c030 100644
--- a/engines/wintermute/Base/BViewport.cpp
+++ b/engines/wintermute/Base/BViewport.cpp
@@ -49,7 +49,7 @@ CBViewport::~CBViewport() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CBViewport::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBViewport::persist(CBPersistMgr *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(Game));
 
diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index 39416377c8..1c845f88be 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -1098,8 +1098,8 @@ const char *CPartEmitter::ScToString() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CPartEmitter::Persist(CBPersistMgr *persistMgr) {
-	CBObject::Persist(persistMgr);
+HRESULT CPartEmitter::persist(CBPersistMgr *persistMgr) {
+	CBObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_width));
 	persistMgr->transfer(TMEMBER(_height));
@@ -1159,20 +1159,20 @@ HRESULT CPartEmitter::Persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_owner));
 
 
-	_sprites.Persist(persistMgr);
+	_sprites.persist(persistMgr);
 
 	int NumForces;
 	if (persistMgr->_saving) {
 		NumForces = _forces.GetSize();
 		persistMgr->transfer(TMEMBER(NumForces));
 		for (int i = 0; i < _forces.GetSize(); i++) {
-			_forces[i]->Persist(persistMgr);
+			_forces[i]->persist(persistMgr);
 		}
 	} else {
 		persistMgr->transfer(TMEMBER(NumForces));
 		for (int i = 0; i < NumForces; i++) {
 			CPartForce *Force = new CPartForce(Game);
-			Force->Persist(persistMgr);
+			Force->persist(persistMgr);
 			_forces.Add(Force);
 		}
 	}
@@ -1182,13 +1182,13 @@ HRESULT CPartEmitter::Persist(CBPersistMgr *persistMgr) {
 		NumParticles = _particles.GetSize();
 		persistMgr->transfer(TMEMBER(NumParticles));
 		for (int i = 0; i < _particles.GetSize(); i++) {
-			_particles[i]->Persist(persistMgr);
+			_particles[i]->persist(persistMgr);
 		}
 	} else {
 		persistMgr->transfer(TMEMBER(NumParticles));
 		for (int i = 0; i < NumParticles; i++) {
 			CPartParticle *Particle = new CPartParticle(Game);
-			Particle->Persist(persistMgr);
+			Particle->persist(persistMgr);
 			_particles.Add(Particle);
 		}
 	}
diff --git a/engines/wintermute/Base/PartForce.cpp b/engines/wintermute/Base/PartForce.cpp
index 441831dc8c..f6be20be93 100644
--- a/engines/wintermute/Base/PartForce.cpp
+++ b/engines/wintermute/Base/PartForce.cpp
@@ -47,7 +47,7 @@ CPartForce::~CPartForce(void) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CPartForce::Persist(CBPersistMgr *persistMgr) {
+HRESULT CPartForce::persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_name));
 	persistMgr->transfer(TMEMBER(_pos));
 	persistMgr->transfer(TMEMBER(_direction));
diff --git a/engines/wintermute/Base/PartForce.h b/engines/wintermute/Base/PartForce.h
index 8bfc7ebf68..548803a4a8 100644
--- a/engines/wintermute/Base/PartForce.h
+++ b/engines/wintermute/Base/PartForce.h
@@ -49,7 +49,7 @@ public:
 	Vector2 _direction;
 	TForceType _type;
 
-	HRESULT Persist(CBPersistMgr *PersistMgr);
+	HRESULT persist(CBPersistMgr *PersistMgr);
 };
 
 } // end of namespace WinterMute
diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp
index da97a702f8..f772e6fe77 100644
--- a/engines/wintermute/Base/PartParticle.cpp
+++ b/engines/wintermute/Base/PartParticle.cpp
@@ -216,7 +216,7 @@ HRESULT CPartParticle::FadeOut(uint32 CurrentTime, int FadeTime) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CPartParticle::Persist(CBPersistMgr *persistMgr) {
+HRESULT CPartParticle::persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(_alpha1));
 	persistMgr->transfer(TMEMBER(_alpha2));
 	persistMgr->transfer(TMEMBER(_border));
diff --git a/engines/wintermute/Base/PartParticle.h b/engines/wintermute/Base/PartParticle.h
index a7f7c37a65..2c5c57034c 100644
--- a/engines/wintermute/Base/PartParticle.h
+++ b/engines/wintermute/Base/PartParticle.h
@@ -76,7 +76,7 @@ public:
 	HRESULT FadeIn(uint32 CurrentTime, int FadeTime);
 	HRESULT FadeOut(uint32 CurrentTime, int FadeTime);
 
-	HRESULT Persist(CBPersistMgr *PersistMgr);
+	HRESULT persist(CBPersistMgr *PersistMgr);
 private:
 	uint32 _fadeStart;
 	int _fadeTime;
diff --git a/engines/wintermute/Base/scriptables/SXArray.cpp b/engines/wintermute/Base/scriptables/SXArray.cpp
index f427a351af..41b3514f92 100644
--- a/engines/wintermute/Base/scriptables/SXArray.cpp
+++ b/engines/wintermute/Base/scriptables/SXArray.cpp
@@ -199,8 +199,8 @@ HRESULT CSXArray::ScSetProperty(const char *Name, CScValue *Value) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXArray::Persist(CBPersistMgr *persistMgr) {
-	CBScriptable::Persist(persistMgr);
+HRESULT CSXArray::persist(CBPersistMgr *persistMgr) {
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_length));
 	persistMgr->transfer(TMEMBER(_values));
diff --git a/engines/wintermute/Base/scriptables/SXDate.cpp b/engines/wintermute/Base/scriptables/SXDate.cpp
index 80905bba37..465999241f 100644
--- a/engines/wintermute/Base/scriptables/SXDate.cpp
+++ b/engines/wintermute/Base/scriptables/SXDate.cpp
@@ -238,9 +238,9 @@ HRESULT CSXDate::ScSetProperty(const char *Name, CScValue *Value) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXDate::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXDate::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_tm.tm_year));
 	persistMgr->transfer(TMEMBER(_tm.tm_mon));
 	persistMgr->transfer(TMEMBER(_tm.tm_mday));
diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index cb883a9a7b..9e61181ad0 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -689,9 +689,9 @@ uint32 CSXFile::GetLength() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXFile::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXFile::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_filename));
 	persistMgr->transfer(TMEMBER(_mode));
diff --git a/engines/wintermute/Base/scriptables/SXMath.cpp b/engines/wintermute/Base/scriptables/SXMath.cpp
index 351fed9fe3..da05de0e95 100644
--- a/engines/wintermute/Base/scriptables/SXMath.cpp
+++ b/engines/wintermute/Base/scriptables/SXMath.cpp
@@ -285,9 +285,9 @@ double CSXMath::RadianToDegree(double Value) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMath::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXMath::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 	return S_OK;
 }
 
diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
index 4fd543663b..88f293367a 100644
--- a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
@@ -454,9 +454,9 @@ HRESULT CSXMemBuffer::ScSetProperty(const char *Name, CScValue *Value) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMemBuffer::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXMemBuffer::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_size));
 
diff --git a/engines/wintermute/Base/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp
index 0e13f5d738..52e7d2d53f 100644
--- a/engines/wintermute/Base/scriptables/SXStore.cpp
+++ b/engines/wintermute/Base/scriptables/SXStore.cpp
@@ -278,10 +278,10 @@ CScValue *CSXStore::ScGetProperty(const char *name) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXStore::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXStore::persist(CBPersistMgr *persistMgr) {
 	if (!persistMgr->_saving) Cleanup();
 
-	CBObject::Persist(persistMgr);
+	CBObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_eventsEnabled));
 	persistMgr->transfer(TMEMBER(_lastProductRequestOwner));
@@ -294,13 +294,13 @@ HRESULT CSXStore::Persist(CBPersistMgr *persistMgr) {
 	if (persistMgr->_saving) {
 		numProducts = _validProducts.GetSize();
 		persistMgr->transfer(TMEMBER(numProducts));
-		for (int i = 0; i < numProducts; i++) _validProducts[i]->Persist(persistMgr);
+		for (int i = 0; i < numProducts; i++) _validProducts[i]->persist(persistMgr);
 	} else {
 		numProducts = _validProducts.GetSize();
 		persistMgr->transfer(TMEMBER(numProducts));
 		for (int i = 0; i < numProducts; i++) {
 			CBStoreProduct *prod = new CBStoreProduct;
-			prod->Persist(persistMgr);
+			prod->persist(persistMgr);
 			_validProducts.Add(prod);
 		}
 	}
diff --git a/engines/wintermute/Base/scriptables/SXStore.h b/engines/wintermute/Base/scriptables/SXStore.h
index 2eff4b065f..200349addf 100644
--- a/engines/wintermute/Base/scriptables/SXStore.h
+++ b/engines/wintermute/Base/scriptables/SXStore.h
@@ -60,7 +60,7 @@ public:
 			delete [] _price;
 		}
 
-		HRESULT Persist(CBPersistMgr *persistMgr) {
+		HRESULT persist(CBPersistMgr *persistMgr) {
 			persistMgr->transfer(TMEMBER(_id));
 			persistMgr->transfer(TMEMBER(_name));
 			persistMgr->transfer(TMEMBER(_desc));
diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp
index 65bf933d0a..fdbcea5ef2 100644
--- a/engines/wintermute/Base/scriptables/SXString.cpp
+++ b/engines/wintermute/Base/scriptables/SXString.cpp
@@ -377,9 +377,9 @@ HRESULT CSXString::ScSetProperty(const char *Name, CScValue *Value) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXString::Persist(CBPersistMgr *persistMgr) {
+HRESULT CSXString::persist(CBPersistMgr *persistMgr) {
 
-	CBScriptable::Persist(persistMgr);
+	CBScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_capacity));
 
diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp
index 0083c55ee9..d81db93e34 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/Base/scriptables/ScEngine.cpp
@@ -564,14 +564,14 @@ HRESULT CScEngine::ResetScript(CScScript *Script) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CScEngine::Persist(CBPersistMgr *persistMgr) {
+HRESULT CScEngine::persist(CBPersistMgr *persistMgr) {
 	if (!persistMgr->_saving) Cleanup();
 
 	persistMgr->transfer(TMEMBER(Game));
 	persistMgr->transfer(TMEMBER(_currentScript));
 	persistMgr->transfer(TMEMBER(_fileToCompile));
 	persistMgr->transfer(TMEMBER(_globals));
-	_scripts.Persist(persistMgr);
+	_scripts.persist(persistMgr);
 
 	return S_OK;
 }
diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp
index 638f4ab816..c293009da1 100644
--- a/engines/wintermute/Base/scriptables/ScScript.cpp
+++ b/engines/wintermute/Base/scriptables/ScScript.cpp
@@ -1153,7 +1153,7 @@ void CScScript::RuntimeError(LPCSTR fmt, ...) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CScScript::Persist(CBPersistMgr *persistMgr) {
+HRESULT CScScript::persist(CBPersistMgr *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(Game));
 
diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp
index 100424bc2d..6e792ceb53 100644
--- a/engines/wintermute/Base/scriptables/ScStack.cpp
+++ b/engines/wintermute/Base/scriptables/ScStack.cpp
@@ -213,12 +213,12 @@ void CScStack::PushNative(CBScriptable *Val, bool Persistent) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CScStack::Persist(CBPersistMgr *persistMgr) {
+HRESULT CScStack::persist(CBPersistMgr *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(Game));
 
 	persistMgr->transfer(TMEMBER(_sP));
-	_values.Persist(persistMgr);
+	_values.persist(persistMgr);
 
 	return S_OK;
 }
diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp
index 81828e3580..2182e58e71 100644
--- a/engines/wintermute/Base/scriptables/ScValue.cpp
+++ b/engines/wintermute/Base/scriptables/ScValue.cpp
@@ -715,7 +715,7 @@ void CScValue::SetValue(CScValue *Val) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CScValue::Persist(CBPersistMgr *persistMgr) {
+HRESULT CScValue::persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(Game));
 
 	persistMgr->transfer(TMEMBER(_persistent));
diff --git a/engines/wintermute/Base/scriptables/SxObject.cpp b/engines/wintermute/Base/scriptables/SxObject.cpp
index 9e33abdb2e..7ebbb45132 100644
--- a/engines/wintermute/Base/scriptables/SxObject.cpp
+++ b/engines/wintermute/Base/scriptables/SxObject.cpp
@@ -58,8 +58,8 @@ CSXObject::~CSXObject() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CSXObject::Persist(CBPersistMgr *persistMgr) {
-	CBObject::Persist(persistMgr);
+HRESULT CSXObject::persist(CBPersistMgr *persistMgr) {
+	CBObject::persist(persistMgr);
 
 	return S_OK;
 }
-- 
cgit v1.2.3