diff options
Diffstat (limited to 'engines/wintermute/Ad')
26 files changed, 78 insertions, 78 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;
}
|