aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-06-22 20:06:12 +0200
committerEinar Johan Trøan Sømåen2012-06-22 20:06:12 +0200
commit9f2c5385ba232c0cc086f3c914b5f98463df330d (patch)
treeddf7d4b01846faad8a938be6899b54e04d0e4c6d
parent77c42af859c12ea7279c28373a200a916e77204f (diff)
downloadscummvm-rg350-9f2c5385ba232c0cc086f3c914b5f98463df330d.tar.gz
scummvm-rg350-9f2c5385ba232c0cc086f3c914b5f98463df330d.tar.bz2
scummvm-rg350-9f2c5385ba232c0cc086f3c914b5f98463df330d.zip
WINTERMUTE: Rename Persist->persist
-rw-r--r--engines/wintermute/Ad/AdActor.cpp10
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp8
-rw-r--r--engines/wintermute/Ad/AdGame.cpp22
-rw-r--r--engines/wintermute/Ad/AdInventory.cpp6
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp4
-rw-r--r--engines/wintermute/Ad/AdItem.cpp4
-rw-r--r--engines/wintermute/Ad/AdLayer.cpp6
-rw-r--r--engines/wintermute/Ad/AdNodeState.cpp2
-rw-r--r--engines/wintermute/Ad/AdObject.cpp8
-rw-r--r--engines/wintermute/Ad/AdPath.cpp4
-rw-r--r--engines/wintermute/Ad/AdPathPoint.cpp4
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp4
-rw-r--r--engines/wintermute/Ad/AdResponse.cpp4
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp8
-rw-r--r--engines/wintermute/Ad/AdResponseContext.cpp2
-rw-r--r--engines/wintermute/Ad/AdRotLevel.cpp4
-rw-r--r--engines/wintermute/Ad/AdScaleLevel.cpp4
-rw-r--r--engines/wintermute/Ad/AdScene.cpp16
-rw-r--r--engines/wintermute/Ad/AdSceneNode.cpp4
-rw-r--r--engines/wintermute/Ad/AdSceneState.cpp4
-rw-r--r--engines/wintermute/Ad/AdSentence.cpp2
-rw-r--r--engines/wintermute/Ad/AdSpriteSet.cpp4
-rw-r--r--engines/wintermute/Ad/AdTalkDef.cpp6
-rw-r--r--engines/wintermute/Ad/AdTalkHolder.cpp8
-rw-r--r--engines/wintermute/Ad/AdTalkNode.cpp2
-rw-r--r--engines/wintermute/Ad/AdWaypointGroup.cpp6
-rw-r--r--engines/wintermute/Base/BFader.cpp4
-rw-r--r--engines/wintermute/Base/BFont.cpp4
-rw-r--r--engines/wintermute/Base/BFontBitmap.cpp4
-rw-r--r--engines/wintermute/Base/BFontStorage.cpp4
-rw-r--r--engines/wintermute/Base/BFontTT.cpp8
-rw-r--r--engines/wintermute/Base/BFontTT.h2
-rw-r--r--engines/wintermute/Base/BFrame.cpp8
-rw-r--r--engines/wintermute/Base/BGame.cpp8
-rw-r--r--engines/wintermute/Base/BKeyboardState.cpp4
-rw-r--r--engines/wintermute/Base/BObject.cpp4
-rw-r--r--engines/wintermute/Base/BPersistMgr.cpp10
-rw-r--r--engines/wintermute/Base/BPoint.cpp2
-rw-r--r--engines/wintermute/Base/BRegion.cpp6
-rw-r--r--engines/wintermute/Base/BScriptHolder.cpp6
-rw-r--r--engines/wintermute/Base/BScriptable.cpp2
-rw-r--r--engines/wintermute/Base/BSound.cpp2
-rw-r--r--engines/wintermute/Base/BSprite.cpp6
-rw-r--r--engines/wintermute/Base/BSubFrame.cpp4
-rw-r--r--engines/wintermute/Base/BSurfaceStorage.cpp4
-rw-r--r--engines/wintermute/Base/BViewport.cpp2
-rw-r--r--engines/wintermute/Base/PartEmitter.cpp14
-rw-r--r--engines/wintermute/Base/PartForce.cpp2
-rw-r--r--engines/wintermute/Base/PartForce.h2
-rw-r--r--engines/wintermute/Base/PartParticle.cpp2
-rw-r--r--engines/wintermute/Base/PartParticle.h2
-rw-r--r--engines/wintermute/Base/scriptables/SXArray.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/SXDate.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/SXFile.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/SXMath.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/SXMemBuffer.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/SXStore.cpp8
-rw-r--r--engines/wintermute/Base/scriptables/SXStore.h2
-rw-r--r--engines/wintermute/Base/scriptables/SXString.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/ScEngine.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/ScScript.cpp2
-rw-r--r--engines/wintermute/Base/scriptables/ScStack.cpp4
-rw-r--r--engines/wintermute/Base/scriptables/ScValue.cpp2
-rw-r--r--engines/wintermute/Base/scriptables/SxObject.cpp4
-rw-r--r--engines/wintermute/UI/UIButton.cpp4
-rw-r--r--engines/wintermute/UI/UIEdit.cpp4
-rw-r--r--engines/wintermute/UI/UIEntity.cpp4
-rw-r--r--engines/wintermute/UI/UIObject.cpp4
-rw-r--r--engines/wintermute/UI/UIText.cpp4
-rw-r--r--engines/wintermute/UI/UITiledImage.cpp4
-rw-r--r--engines/wintermute/UI/UIWindow.cpp6
-rw-r--r--engines/wintermute/coll_templ.h4
-rw-r--r--engines/wintermute/persistent.h4
-rw-r--r--engines/wintermute/video/VidTheoraPlayer.cpp4
74 files changed, 182 insertions, 182 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 68d173102e..da73b5161c 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -1187,8 +1187,8 @@ CBSprite *CAdActor::GetTalkStanceOld(const char *Stance) {
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdActor::Persist(CBPersistMgr *persistMgr) {
- CAdTalkHolder::Persist(persistMgr);
+HRESULT CAdActor::persist(CBPersistMgr *persistMgr) {
+ CAdTalkHolder::persist(persistMgr);
persistMgr->transfer(TMEMBER_INT(_dir));
persistMgr->transfer(TMEMBER(_path));
@@ -1198,8 +1198,8 @@ HRESULT CAdActor::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_pFX));
persistMgr->transfer(TMEMBER(_pFY));
persistMgr->transfer(TMEMBER(_standSprite));
- _talkSprites.Persist(persistMgr);
- _talkSpritesEx.Persist(persistMgr);
+ _talkSprites.persist(persistMgr);
+ _talkSpritesEx.persist(persistMgr);
persistMgr->transfer(TMEMBER_INT(_targetDir));
persistMgr->transfer(TMEMBER_INT(_afterWalkDir));
persistMgr->transfer(TMEMBER(_targetPoint));
@@ -1214,7 +1214,7 @@ HRESULT CAdActor::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_turnLeftAnimName));
persistMgr->transfer(TMEMBER(_turnRightAnimName));
- _anims.Persist(persistMgr);
+ _anims.persist(persistMgr);
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 62b3156842..1f98d15f36 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -977,15 +977,15 @@ void CAdEntity::UpdatePosition() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::Persist(CBPersistMgr *persistMgr) {
- CAdTalkHolder::Persist(persistMgr);
+HRESULT CAdEntity::persist(CBPersistMgr *persistMgr) {
+ CAdTalkHolder::persist(persistMgr);
persistMgr->transfer(TMEMBER(_item));
persistMgr->transfer(TMEMBER(_region));
//persistMgr->transfer(TMEMBER(_sprite));
persistMgr->transfer(TMEMBER_INT(_subtype));
- _talkSprites.Persist(persistMgr);
- _talkSpritesEx.Persist(persistMgr);
+ _talkSprites.persist(persistMgr);
+ _talkSpritesEx.persist(persistMgr);
persistMgr->transfer(TMEMBER(_walkToX));
persistMgr->transfer(TMEMBER(_walkToY));
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index c20bf721de..23d144a426 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1263,31 +1263,31 @@ HRESULT CAdGame::LoadBuffer(byte *Buffer, bool Complete) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdGame::persist(CBPersistMgr *persistMgr) {
if (!persistMgr->_saving) Cleanup();
- CBGame::Persist(persistMgr);
+ CBGame::persist(persistMgr);
- _dlgPendingBranches.Persist(persistMgr);
+ _dlgPendingBranches.persist(persistMgr);
- _inventories.Persist(persistMgr);
+ _inventories.persist(persistMgr);
persistMgr->transfer(TMEMBER(_inventoryBox));
- _objects.Persist(persistMgr);
+ _objects.persist(persistMgr);
persistMgr->transfer(TMEMBER(_prevSceneName));
persistMgr->transfer(TMEMBER(_prevSceneFilename));
persistMgr->transfer(TMEMBER(_responseBox));
- _responsesBranch.Persist(persistMgr);
- _responsesGame.Persist(persistMgr);
+ _responsesBranch.persist(persistMgr);
+ _responsesGame.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scene));
- _sceneStates.Persist(persistMgr);
+ _sceneStates.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scheduledFadeIn));
persistMgr->transfer(TMEMBER(_scheduledScene));
persistMgr->transfer(TMEMBER(_selectedItem));
persistMgr->transfer(TMEMBER_INT(_talkSkipButton));
- _sentences.Persist(persistMgr);
+ _sentences.persist(persistMgr);
persistMgr->transfer(TMEMBER(_sceneViewport));
persistMgr->transfer(TMEMBER_INT(_stateEx));
@@ -1297,11 +1297,11 @@ HRESULT CAdGame::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_invObject));
persistMgr->transfer(TMEMBER(_inventoryOwner));
persistMgr->transfer(TMEMBER(_tempDisableSaveState));
- _items.Persist(persistMgr);
+ _items.persist(persistMgr);
persistMgr->transfer(TMEMBER(_itemsFile));
- _speechDirs.Persist(persistMgr);
+ _speechDirs.persist(persistMgr);
persistMgr->transfer(TMEMBER(_smartItemCursor));
if (!persistMgr->_saving) _initialScene = false;
diff --git a/engines/wintermute/Ad/AdInventory.cpp b/engines/wintermute/Ad/AdInventory.cpp
index c81e1f4be7..fd94d906e6 100644
--- a/engines/wintermute/Ad/AdInventory.cpp
+++ b/engines/wintermute/Ad/AdInventory.cpp
@@ -106,11 +106,11 @@ HRESULT CAdInventory::RemoveItem(CAdItem *Item) {
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventory::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdInventory::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
- _takenItems.Persist(persistMgr);
+ _takenItems.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scrollOffset));
return S_OK;
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index debe74db01..e4da8e975c 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -350,8 +350,8 @@ HRESULT CAdInventoryBox::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventoryBox::Persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+HRESULT CAdInventoryBox::persist(CBPersistMgr *persistMgr) {
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_closeButton));
persistMgr->transfer(TMEMBER(_hideSelected));
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 366efefdc1..8d891f7d19 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -729,9 +729,9 @@ const char *CAdItem::ScToString() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdItem::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdItem::persist(CBPersistMgr *persistMgr) {
- CAdTalkHolder::Persist(persistMgr);
+ CAdTalkHolder::persist(persistMgr);
persistMgr->transfer(TMEMBER(_cursorCombined));
persistMgr->transfer(TMEMBER(_cursorHover));
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index ae8baabcd6..28f437e703 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -521,15 +521,15 @@ HRESULT CAdLayer::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdLayer::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdLayer::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_active));
persistMgr->transfer(TMEMBER(_closeUp));
persistMgr->transfer(TMEMBER(_height));
persistMgr->transfer(TMEMBER(_main));
- _nodes.Persist(persistMgr);
+ _nodes.persist(persistMgr);
persistMgr->transfer(TMEMBER(_width));
return S_OK;
diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 7089e63a31..0a7389045f 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -92,7 +92,7 @@ void CAdNodeState::SetCursor(const char *Filename) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdNodeState::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdNodeState::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(Game));
persistMgr->transfer(TMEMBER(_active));
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 4f93a30a8e..85a6ad49b3 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -953,8 +953,8 @@ HRESULT CAdObject::Reset() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::Persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+HRESULT CAdObject::persist(CBPersistMgr *persistMgr) {
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_active));
persistMgr->transfer(TMEMBER(_blockRegion));
@@ -985,8 +985,8 @@ HRESULT CAdObject::Persist(CBPersistMgr *persistMgr) {
for (int i = 0; i < MAX_NUM_REGIONS; i++) persistMgr->transfer(TMEMBER(_currentRegions[i]));
- _attachmentsPre.Persist(persistMgr);
- _attachmentsPost.Persist(persistMgr);
+ _attachmentsPre.persist(persistMgr);
+ _attachmentsPost.persist(persistMgr);
persistMgr->transfer(TMEMBER(_registerAlias));
persistMgr->transfer(TMEMBER(_partFollowParent));
diff --git a/engines/wintermute/Ad/AdPath.cpp b/engines/wintermute/Ad/AdPath.cpp
index 6fcaa47866..620ea5c38c 100644
--- a/engines/wintermute/Ad/AdPath.cpp
+++ b/engines/wintermute/Ad/AdPath.cpp
@@ -98,12 +98,12 @@ bool CAdPath::SetReady(bool ready) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdPath::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdPath::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(Game));
persistMgr->transfer(TMEMBER(_currIndex));
- _points.Persist(persistMgr);
+ _points.persist(persistMgr);
persistMgr->transfer(TMEMBER(_ready));
return S_OK;
diff --git a/engines/wintermute/Ad/AdPathPoint.cpp b/engines/wintermute/Ad/AdPathPoint.cpp
index d74284fa22..4f82f8e7f4 100644
--- a/engines/wintermute/Ad/AdPathPoint.cpp
+++ b/engines/wintermute/Ad/AdPathPoint.cpp
@@ -61,9 +61,9 @@ CAdPathPoint::~CAdPathPoint() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdPathPoint::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdPathPoint::persist(CBPersistMgr *persistMgr) {
- CBPoint::Persist(persistMgr);
+ CBPoint::persist(persistMgr);
persistMgr->transfer(TMEMBER(_distance));
persistMgr->transfer(TMEMBER(_marked));
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 16598e409b..19e817dd04 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -378,8 +378,8 @@ HRESULT CAdRegion::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::Persist(CBPersistMgr *persistMgr) {
- CBRegion::Persist(persistMgr);
+HRESULT CAdRegion::persist(CBPersistMgr *persistMgr) {
+ CBRegion::persist(persistMgr);
persistMgr->transfer(TMEMBER(_alpha));
persistMgr->transfer(TMEMBER(_blocked));
diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 4567e90109..cd67a7c0f7 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -124,9 +124,9 @@ HRESULT CAdResponse::SetIconPressed(const char *Filename) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdResponse::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdResponse::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_icon));
persistMgr->transfer(TMEMBER(_iconHover));
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 26590af65f..7a38451925 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -511,17 +511,17 @@ HRESULT CAdResponseBox::Listen(CBScriptHolder *param1, uint32 param2) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdResponseBox::Persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+HRESULT CAdResponseBox::persist(CBPersistMgr *persistMgr) {
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_font));
persistMgr->transfer(TMEMBER(_fontHover));
persistMgr->transfer(TMEMBER(_horizontal));
persistMgr->transfer(TMEMBER(_lastResponseText));
persistMgr->transfer(TMEMBER(_lastResponseTextOrig));
- _respButtons.Persist(persistMgr);
+ _respButtons.persist(persistMgr);
persistMgr->transfer(TMEMBER(_responseArea));
- _responses.Persist(persistMgr);
+ _responses.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scrollOffset));
persistMgr->transfer(TMEMBER(_shieldWindow));
persistMgr->transfer(TMEMBER(_spacing));
diff --git a/engines/wintermute/Ad/AdResponseContext.cpp b/engines/wintermute/Ad/AdResponseContext.cpp
index 054681f656..6947838ff0 100644
--- a/engines/wintermute/Ad/AdResponseContext.cpp
+++ b/engines/wintermute/Ad/AdResponseContext.cpp
@@ -49,7 +49,7 @@ CAdResponseContext::~CAdResponseContext() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdResponseContext::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdResponseContext::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(Game));
persistMgr->transfer(TMEMBER(_context));
persistMgr->transfer(TMEMBER(_iD));
diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp
index c35784d4d6..371c2f6ab0 100644
--- a/engines/wintermute/Ad/AdRotLevel.cpp
+++ b/engines/wintermute/Ad/AdRotLevel.cpp
@@ -147,9 +147,9 @@ HRESULT CAdRotLevel::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdRotLevel::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdRotLevel::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_rotation));
diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp
index 5ab835a149..be459bbcaf 100644
--- a/engines/wintermute/Ad/AdScaleLevel.cpp
+++ b/engines/wintermute/Ad/AdScaleLevel.cpp
@@ -145,9 +145,9 @@ HRESULT CAdScaleLevel::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScaleLevel::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdScaleLevel::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_scale));
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index cc51ddef22..e8229a3351 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -2135,8 +2135,8 @@ float CAdScene::GetScaleAt(int Y) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::Persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+HRESULT CAdScene::persist(CBPersistMgr *persistMgr) {
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_autoScroll));
persistMgr->transfer(TMEMBER(_editorColBlocked));
@@ -2163,23 +2163,23 @@ HRESULT CAdScene::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_initialized));
persistMgr->transfer(TMEMBER(_lastTimeH));
persistMgr->transfer(TMEMBER(_lastTimeV));
- _layers.Persist(persistMgr);
+ _layers.persist(persistMgr);
persistMgr->transfer(TMEMBER(_mainLayer));
- _objects.Persist(persistMgr);
+ _objects.persist(persistMgr);
persistMgr->transfer(TMEMBER(_offsetLeft));
persistMgr->transfer(TMEMBER(_offsetTop));
persistMgr->transfer(TMEMBER(_paralaxScrolling));
persistMgr->transfer(TMEMBER(_persistentState));
persistMgr->transfer(TMEMBER(_persistentStateSprites));
persistMgr->transfer(TMEMBER(_pFMaxTime));
- _pFPath.Persist(persistMgr);
+ _pFPath.persist(persistMgr);
persistMgr->transfer(TMEMBER(_pFPointsNum));
persistMgr->transfer(TMEMBER(_pFReady));
persistMgr->transfer(TMEMBER(_pFRequester));
persistMgr->transfer(TMEMBER(_pFTarget));
persistMgr->transfer(TMEMBER(_pFTargetPath));
- _rotLevels.Persist(persistMgr);
- _scaleLevels.Persist(persistMgr);
+ _rotLevels.persist(persistMgr);
+ _scaleLevels.persist(persistMgr);
persistMgr->transfer(TMEMBER(_scrollPixelsH));
persistMgr->transfer(TMEMBER(_scrollPixelsV));
persistMgr->transfer(TMEMBER(_scrollTimeH));
@@ -2187,7 +2187,7 @@ HRESULT CAdScene::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_shieldWindow));
persistMgr->transfer(TMEMBER(_targetOffsetLeft));
persistMgr->transfer(TMEMBER(_targetOffsetTop));
- _waypointGroups.Persist(persistMgr);
+ _waypointGroups.persist(persistMgr);
persistMgr->transfer(TMEMBER(_viewport));
persistMgr->transfer(TMEMBER(_width));
diff --git a/engines/wintermute/Ad/AdSceneNode.cpp b/engines/wintermute/Ad/AdSceneNode.cpp
index 071469c996..d1584f192e 100644
--- a/engines/wintermute/Ad/AdSceneNode.cpp
+++ b/engines/wintermute/Ad/AdSceneNode.cpp
@@ -69,9 +69,9 @@ HRESULT CAdSceneNode::SetRegion(CAdRegion *Region) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdSceneNode::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdSceneNode::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_entity));
persistMgr->transfer(TMEMBER(_region));
diff --git a/engines/wintermute/Ad/AdSceneState.cpp b/engines/wintermute/Ad/AdSceneState.cpp
index a3dfc3c27d..9e7260d5a7 100644
--- a/engines/wintermute/Ad/AdSceneState.cpp
+++ b/engines/wintermute/Ad/AdSceneState.cpp
@@ -54,9 +54,9 @@ CAdSceneState::~CAdSceneState() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdSceneState::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdSceneState::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_filename));
- _nodeStates.Persist(persistMgr);
+ _nodeStates.persist(persistMgr);
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index dd6a8c9269..a893a00489 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -211,7 +211,7 @@ HRESULT CAdSentence::Finish() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdSentence::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdSentence::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(Game));
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 86937dde8e..4f6d17b7dd 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -214,9 +214,9 @@ HRESULT CAdSpriteSet::LoadBuffer(byte *Buffer, bool Complete, int LifeTime, TSp
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdSpriteSet::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdSpriteSet::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_owner));
for (int i = 0; i < NUM_DIRECTIONS; i++) {
diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index 283df609cb..2f3e9de799 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -194,16 +194,16 @@ HRESULT CAdTalkDef::LoadBuffer(byte *Buffer, bool Complete) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkDef::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdTalkDef::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_defaultSprite));
persistMgr->transfer(TMEMBER(_defaultSpriteFilename));
persistMgr->transfer(TMEMBER(_defaultSpriteSet));
persistMgr->transfer(TMEMBER(_defaultSpriteSetFilename));
- _nodes.Persist(persistMgr);
+ _nodes.persist(persistMgr);
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp
index e8b691b9fd..162fcf0f2b 100644
--- a/engines/wintermute/Ad/AdTalkHolder.cpp
+++ b/engines/wintermute/Ad/AdTalkHolder.cpp
@@ -343,12 +343,12 @@ HRESULT CAdTalkHolder::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::Persist(CBPersistMgr *persistMgr) {
- CAdObject::Persist(persistMgr);
+HRESULT CAdTalkHolder::persist(CBPersistMgr *persistMgr) {
+ CAdObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_sprite));
- _talkSprites.Persist(persistMgr);
- _talkSpritesEx.Persist(persistMgr);
+ _talkSprites.persist(persistMgr);
+ _talkSpritesEx.persist(persistMgr);
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index 0a3adc1632..bb6ff83efb 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -183,7 +183,7 @@ HRESULT CAdTalkNode::LoadBuffer(byte *Buffer, bool Complete) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkNode::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdTalkNode::persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_comment));
persistMgr->transfer(TMEMBER(_startTime));
persistMgr->transfer(TMEMBER(_endTime));
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 77cec106dd..a9d29692c5 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -184,16 +184,16 @@ HRESULT CAdWaypointGroup::SaveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdWaypointGroup::Persist(CBPersistMgr *persistMgr) {
+HRESULT CAdWaypointGroup::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/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;
}
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 9decb4ea2a..93bef195ea 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -1008,9 +1008,9 @@ const char *CUIButton::ScToString() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIButton::persist(CBPersistMgr *persistMgr) {
- CUIObject::Persist(persistMgr);
+ CUIObject::persist(persistMgr);
persistMgr->transfer(TMEMBER_INT(_align));
persistMgr->transfer(TMEMBER(_backDisable));
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index f6224c5e90..3b4b274bd0 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -836,9 +836,9 @@ int CUIEdit::InsertChars(int Pos, byte *Chars, int Num) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIEdit::persist(CBPersistMgr *persistMgr) {
- CUIObject::Persist(persistMgr);
+ CUIObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_cursorBlinkRate));
persistMgr->transfer(TMEMBER(_cursorChar));
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index ed0c9e1230..d8d53270ef 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -328,9 +328,9 @@ const char *CUIEntity::ScToString() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIEntity::persist(CBPersistMgr *persistMgr) {
- CUIObject::Persist(persistMgr);
+ CUIObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_entity));
return S_OK;
diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index 4160bf1115..64a2b28084 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -555,9 +555,9 @@ HRESULT CUIObject::GetTotalOffset(int *OffsetX, int *OffsetY) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIObject::persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_back));
persistMgr->transfer(TMEMBER(_canFocus));
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index f9ac91d422..7213c34534 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -467,9 +467,9 @@ const char *CUIText::ScToString() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIText::persist(CBPersistMgr *persistMgr) {
- CUIObject::Persist(persistMgr);
+ CUIObject::persist(persistMgr);
persistMgr->transfer(TMEMBER_INT(_textAlign));
persistMgr->transfer(TMEMBER_INT(_verticalAlign));
diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp
index 79c2278d0b..ba2558aa84 100644
--- a/engines/wintermute/UI/UITiledImage.cpp
+++ b/engines/wintermute/UI/UITiledImage.cpp
@@ -350,8 +350,8 @@ void CUITiledImage::CorrectSize(int *Width, int *Height) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUITiledImage::Persist(CBPersistMgr *persistMgr) {
- CBObject::Persist(persistMgr);
+HRESULT CUITiledImage::persist(CBPersistMgr *persistMgr) {
+ CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_downLeft));
persistMgr->transfer(TMEMBER(_downMiddle));
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index b8f00fdb1e..d0d91084d9 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -1150,9 +1150,9 @@ HRESULT CUIWindow::HandleMouse(TMouseEvent Event, TMouseButton Button) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::Persist(CBPersistMgr *persistMgr) {
+HRESULT CUIWindow::persist(CBPersistMgr *persistMgr) {
- CUIObject::Persist(persistMgr);
+ CUIObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_backInactive));
persistMgr->transfer(TMEMBER(_clipContents));
@@ -1174,7 +1174,7 @@ HRESULT CUIWindow::Persist(CBPersistMgr *persistMgr) {
persistMgr->transfer(TMEMBER(_viewport));
persistMgr->transfer(TMEMBER(_pauseMusic));
- _widgets.Persist(persistMgr);
+ _widgets.persist(persistMgr);
return S_OK;
}
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index 131a261bf1..c9e85253e5 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -88,7 +88,7 @@ public:
// Clean up
void FreeExtra();
void RemoveAll();
- HRESULT Persist(CBPersistMgr *persistMgr);
+ HRESULT persist(CBPersistMgr *persistMgr);
// Accessing elements
TYPE GetAt(int nIndex) const;
@@ -346,7 +346,7 @@ void CBArray<TYPE, ARG_TYPE>::InsertAt(int nStartIndex, CBArray *pNewArray) {
/////////////////////////////////////////////////////////////////////////////
template<class TYPE, class ARG_TYPE>
-HRESULT CBArray<TYPE, ARG_TYPE>::Persist(CBPersistMgr *persistMgr) {
+HRESULT CBArray<TYPE, ARG_TYPE>::persist(CBPersistMgr *persistMgr) {
int i, j;
if (persistMgr->_saving) {
j = GetSize();
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index f6da9cf293..7184d48829 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -52,7 +52,7 @@ namespace WinterMute {
virtual const char* GetClassName();\
static HRESULT WINAPI PersistLoad(void* Instance, CBPersistMgr* PersistMgr);\
class_name(TDynamicConstructor p1, TDynamicConstructor p2):parent_class(p1, p2){ /*memset(this, 0, sizeof(class_name));*/ };\
- virtual HRESULT Persist(CBPersistMgr* PersistMgr);\
+ virtual HRESULT persist(CBPersistMgr* PersistMgr);\
void* operator new (size_t size);\
void operator delete(void* p);\
@@ -64,7 +64,7 @@ namespace WinterMute {
}\
\
HRESULT class_name::PersistLoad(void* Instance, CBPersistMgr* PersistMgr){\
- return ((class_name*)Instance)->Persist(PersistMgr);\
+ return ((class_name*)Instance)->persist(PersistMgr);\
}\
\
const char* class_name::GetClassName(){\
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index d44231d0d0..1afd114bd4 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -797,8 +797,8 @@ HRESULT CVidTheoraPlayer::resume() {
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CVidTheoraPlayer::Persist(CBPersistMgr *persistMgr) {
- //CBBase::Persist(persistMgr);
+HRESULT CVidTheoraPlayer::persist(CBPersistMgr *persistMgr) {
+ //CBBase::persist(persistMgr);
if (persistMgr->_saving) {
_savedPos = getMovieTime() * 1000;