diff options
Diffstat (limited to 'engines/wintermute/Ad')
31 files changed, 77 insertions, 77 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index a5a3895dc3..09f19da65c 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -428,7 +428,7 @@ HRESULT CAdActor::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
case TOKEN_ANIMATION: {
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index dae511982d..0cd1276885 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -431,7 +431,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
case TOKEN_WALK_TO_X:
@@ -877,7 +877,7 @@ const char *CAdEntity::scToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdEntity::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "ENTITY {\n");
Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
if (_subtype == ENTITY_SOUND)
@@ -942,13 +942,13 @@ HRESULT CAdEntity::SaveAsText(CBDynBuffer *Buffer, int Indent) { if (_cursor && _cursor->_filename)
Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
- CAdTalkHolder::SaveAsText(Buffer, Indent + 2);
+ CAdTalkHolder::saveAsText(Buffer, Indent + 2);
- if (_region) _region->SaveAsText(Buffer, Indent + 2);
+ if (_region) _region->saveAsText(Buffer, Indent + 2);
- if (_scProp) _scProp->SaveAsText(Buffer, Indent + 2);
+ if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
- CAdObject::SaveAsText(Buffer, Indent + 2);
+ CAdObject::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n\n");
diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/Ad/AdEntity.h index 7dff8c072b..9418147cb7 100644 --- a/engines/wintermute/Ad/AdEntity.h +++ b/engines/wintermute/Ad/AdEntity.h @@ -46,7 +46,7 @@ public: void UpdatePosition();
virtual int GetHeight();
CBRegion *_region;
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
virtual HRESULT Update();
virtual HRESULT Display();
CAdEntity(CBGame *inGame);
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index b852ec4469..049247db0a 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -1229,7 +1229,7 @@ HRESULT CAdGame::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params2, false);
+ parseEditorProperty(params2, false);
break;
case TOKEN_STARTUP_SCENE:
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp index 100d4f8d8e..7a1b7d6f00 100644 --- a/engines/wintermute/Ad/AdInventoryBox.cpp +++ b/engines/wintermute/Ad/AdInventoryBox.cpp @@ -281,7 +281,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -317,7 +317,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventoryBox::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdInventoryBox::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "INVENTORY_BOX\n");
Buffer->PutTextIndent(Indent, "{\n");
@@ -337,12 +337,12 @@ HRESULT CAdInventoryBox::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "\n");
// window
- if (_window) _window->SaveAsText(Buffer, Indent + 2);
+ if (_window) _window->saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent + 2, "\n");
// editor properties
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
return S_OK;
diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h index c7aeca6eab..463c6c224a 100644 --- a/engines/wintermute/Ad/AdInventoryBox.h +++ b/engines/wintermute/Ad/AdInventoryBox.h @@ -55,7 +55,7 @@ public: virtual ~CAdInventoryBox();
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index bb7d9a1607..7f4a8d6525 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -296,7 +296,7 @@ HRESULT CAdItem::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp index eec0754793..1183e0efa1 100644 --- a/engines/wintermute/Ad/AdLayer.cpp +++ b/engines/wintermute/Ad/AdLayer.cpp @@ -211,7 +211,7 @@ HRESULT CAdLayer::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -478,7 +478,7 @@ const char *CAdLayer::scToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdLayer::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdLayer::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "LAYER {\n");
Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption());
@@ -496,15 +496,15 @@ HRESULT CAdLayer::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- if (_scProp) _scProp->SaveAsText(Buffer, Indent + 2);
+ if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
for (i = 0; i < _nodes.GetSize(); i++) {
switch (_nodes[i]->_type) {
case OBJECT_ENTITY:
- _nodes[i]->_entity->SaveAsText(Buffer, Indent + 2);
+ _nodes[i]->_entity->saveAsText(Buffer, Indent + 2);
break;
case OBJECT_REGION:
- _nodes[i]->_region->SaveAsText(Buffer, Indent + 2);
+ _nodes[i]->_region->saveAsText(Buffer, Indent + 2);
break;
default:
error("CAdLayer::SaveAsText - Unhandled enum");
@@ -512,7 +512,7 @@ HRESULT CAdLayer::SaveAsText(CBDynBuffer *Buffer, int Indent) { }
}
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n\n");
diff --git a/engines/wintermute/Ad/AdLayer.h b/engines/wintermute/Ad/AdLayer.h index c06c1e7c92..69208298a7 100644 --- a/engines/wintermute/Ad/AdLayer.h +++ b/engines/wintermute/Ad/AdLayer.h @@ -44,7 +44,7 @@ public: CBArray<CAdSceneNode *, CAdSceneNode *> _nodes;
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
virtual CScValue *scGetProperty(const char *Name);
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index bbd51907fe..15c07aa22b 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -1025,11 +1025,11 @@ bool CAdObject::GetExtendedFlag(const char *FlagName) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::SaveAsText(CBDynBuffer *Buffer, int Indent) {
- if (_blockRegion) _blockRegion->SaveAsText(Buffer, Indent + 2, "BLOCKED_REGION");
- if (_wptGroup) _wptGroup->SaveAsText(Buffer, Indent + 2);
+HRESULT CAdObject::saveAsText(CBDynBuffer *Buffer, int Indent) {
+ if (_blockRegion) _blockRegion->saveAsText(Buffer, Indent + 2, "BLOCKED_REGION");
+ if (_wptGroup) _wptGroup->saveAsText(Buffer, Indent + 2);
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h index a7527bd8f6..6c20e5d84e 100644 --- a/engines/wintermute/Ad/AdObject.h +++ b/engines/wintermute/Ad/AdObject.h @@ -93,7 +93,7 @@ public: CAdWaypointGroup *_currentWptGroup;
CAdInventory *GetInventory();
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
virtual HRESULT AfterMove();
CAdRegion *_currentRegions[MAX_NUM_REGIONS];
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp index 8ec34d3fe8..fb8493b1d4 100644 --- a/engines/wintermute/Ad/AdRegion.cpp +++ b/engines/wintermute/Ad/AdRegion.cpp @@ -199,7 +199,7 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -346,7 +346,7 @@ const char *CAdRegion::scToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdRegion::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "REGION {\n");
Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption());
@@ -363,13 +363,13 @@ HRESULT CAdRegion::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- if (_scProp) _scProp->SaveAsText(Buffer, Indent + 2);
+ if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
for (i = 0; i < _points.GetSize(); i++) {
Buffer->PutTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n\n");
diff --git a/engines/wintermute/Ad/AdRegion.h b/engines/wintermute/Ad/AdRegion.h index a7db643104..2608aae77c 100644 --- a/engines/wintermute/Ad/AdRegion.h +++ b/engines/wintermute/Ad/AdRegion.h @@ -44,7 +44,7 @@ public: virtual ~CAdRegion();
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
virtual CScValue *scGetProperty(const char *Name);
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index 0359da03dd..1da0389037 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -305,7 +305,7 @@ HRESULT CAdResponseBox::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
case TOKEN_CURSOR:
@@ -335,7 +335,7 @@ HRESULT CAdResponseBox::LoadBuffer(byte *Buffer, bool Complete) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdResponseBox::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdResponseBox::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "RESPONSE_BOX\n");
Buffer->PutTextIndent(Indent, "{\n");
@@ -383,12 +383,12 @@ HRESULT CAdResponseBox::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "\n");
// window
- if (_window) _window->SaveAsText(Buffer, Indent + 2);
+ if (_window) _window->saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent + 2, "\n");
// editor properties
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
return S_OK;
diff --git a/engines/wintermute/Ad/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h index 8f26940d0a..52e5e20d76 100644 --- a/engines/wintermute/Ad/AdResponseBox.h +++ b/engines/wintermute/Ad/AdResponseBox.h @@ -77,7 +77,7 @@ public: TTextAlign _align;
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp index 371c2f6ab0..b1256c9f27 100644 --- a/engines/wintermute/Ad/AdRotLevel.cpp +++ b/engines/wintermute/Ad/AdRotLevel.cpp @@ -121,7 +121,7 @@ HRESULT CAdRotLevel::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -135,11 +135,11 @@ HRESULT CAdRotLevel::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdRotLevel::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdRotLevel::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "ROTATION_LEVEL {\n");
Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
Buffer->PutTextIndent(Indent + 2, "ROTATION=%d\n", (int)_rotation);
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
return S_OK;
diff --git a/engines/wintermute/Ad/AdRotLevel.h b/engines/wintermute/Ad/AdRotLevel.h index 94612c15b5..5701055a97 100644 --- a/engines/wintermute/Ad/AdRotLevel.h +++ b/engines/wintermute/Ad/AdRotLevel.h @@ -39,7 +39,7 @@ public: CAdRotLevel(CBGame *inGame);
virtual ~CAdRotLevel();
float _rotation;
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
};
diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp index be459bbcaf..8e03781382 100644 --- a/engines/wintermute/Ad/AdScaleLevel.cpp +++ b/engines/wintermute/Ad/AdScaleLevel.cpp @@ -119,7 +119,7 @@ HRESULT CAdScaleLevel::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -133,11 +133,11 @@ HRESULT CAdScaleLevel::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdScaleLevel::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdScaleLevel::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "SCALE_LEVEL {\n");
Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
Buffer->PutTextIndent(Indent + 2, "SCALE=%d\n", (int)_scale);
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
return S_OK;
diff --git a/engines/wintermute/Ad/AdScaleLevel.h b/engines/wintermute/Ad/AdScaleLevel.h index 28fdbceb41..2026a1ff58 100644 --- a/engines/wintermute/Ad/AdScaleLevel.h +++ b/engines/wintermute/Ad/AdScaleLevel.h @@ -40,7 +40,7 @@ public: float _scale;
CAdScaleLevel(CBGame *inGame);
virtual ~CAdScaleLevel();
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
HRESULT LoadFile(const char *Filename);
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
};
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index 9637d09516..e14a6ce5ba 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -836,7 +836,7 @@ HRESULT CAdScene::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
@@ -1969,7 +1969,7 @@ HRESULT CAdScene::RemoveObject(CAdObject *Object) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdScene::saveAsText(CBDynBuffer *Buffer, int Indent) {
int i;
Buffer->PutTextIndent(Indent, "SCENE {\n");
@@ -1992,7 +1992,7 @@ HRESULT CAdScene::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "\n");
// properties
- if (_scProp) _scProp->SaveAsText(Buffer, Indent + 2);
+ if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
// viewport
if (_viewport) {
@@ -2027,25 +2027,25 @@ HRESULT CAdScene::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "\n");
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
// waypoints
Buffer->PutTextIndent(Indent + 2, "; ----- waypoints\n");
- for (i = 0; i < _waypointGroups.GetSize(); i++) _waypointGroups[i]->SaveAsText(Buffer, Indent + 2);
+ for (i = 0; i < _waypointGroups.GetSize(); i++) _waypointGroups[i]->saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent + 2, "\n");
// layers
Buffer->PutTextIndent(Indent + 2, "; ----- layers\n");
- for (i = 0; i < _layers.GetSize(); i++) _layers[i]->SaveAsText(Buffer, Indent + 2);
+ for (i = 0; i < _layers.GetSize(); i++) _layers[i]->saveAsText(Buffer, Indent + 2);
// scale levels
Buffer->PutTextIndent(Indent + 2, "; ----- scale levels\n");
- for (i = 0; i < _scaleLevels.GetSize(); i++) _scaleLevels[i]->SaveAsText(Buffer, Indent + 2);
+ for (i = 0; i < _scaleLevels.GetSize(); i++) _scaleLevels[i]->saveAsText(Buffer, Indent + 2);
// rotation levels
Buffer->PutTextIndent(Indent + 2, "; ----- rotation levels\n");
- for (i = 0; i < _rotLevels.GetSize(); i++) _rotLevels[i]->SaveAsText(Buffer, Indent + 2);
+ for (i = 0; i < _rotLevels.GetSize(); i++) _rotLevels[i]->saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent + 2, "\n");
@@ -2054,7 +2054,7 @@ HRESULT CAdScene::SaveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "; ----- free entities\n");
for (i = 0; i < _objects.GetSize(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
- _objects[i]->SaveAsText(Buffer, Indent + 2);
+ _objects[i]->saveAsText(Buffer, Indent + 2);
}
}
diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h index f772183cb4..4d3720ecfa 100644 --- a/engines/wintermute/Ad/AdScene.h +++ b/engines/wintermute/Ad/AdScene.h @@ -87,7 +87,7 @@ public: float GetScaleAt(int Y);
HRESULT SortScaleLevels();
HRESULT SortRotLevels();
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
uint32 GetAlphaAt(int X, int Y, bool ColorCheck = false);
bool _paralaxScrolling;
void SkipTo(int OffsetX, int OffsetY);
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp index 70b5f15dbe..64de71f39d 100644 --- a/engines/wintermute/Ad/AdSpriteSet.cpp +++ b/engines/wintermute/Ad/AdSpriteSet.cpp @@ -194,7 +194,7 @@ HRESULT CAdSpriteSet::LoadBuffer(byte *Buffer, bool Complete, int LifeTime, TSp break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -259,7 +259,7 @@ CBSprite *CAdSpriteSet::GetSprite(TDirection Direction) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdSpriteSet::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdSpriteSet::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "SPRITESET {\n");
if (_name) Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
for (int i = 0; i < NUM_DIRECTIONS; i++) {
@@ -293,7 +293,7 @@ HRESULT CAdSpriteSet::SaveAsText(CBDynBuffer *Buffer, int Indent) { }
}
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
diff --git a/engines/wintermute/Ad/AdSpriteSet.h b/engines/wintermute/Ad/AdSpriteSet.h index 07d2097215..fab0d7143a 100644 --- a/engines/wintermute/Ad/AdSpriteSet.h +++ b/engines/wintermute/Ad/AdSpriteSet.h @@ -38,7 +38,7 @@ namespace WinterMute { class CAdSpriteSet : public CBObject {
public:
bool ContainsSprite(CBSprite *Sprite);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent = 0);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent = 0);
CBSprite *GetSprite(TDirection Direction);
DECLARE_PERSISTENT(CAdSpriteSet, CBObject)
CBObject *_owner;
diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp index 2f3e9de799..41ea23ff38 100644 --- a/engines/wintermute/Ad/AdTalkDef.cpp +++ b/engines/wintermute/Ad/AdTalkDef.cpp @@ -159,7 +159,7 @@ HRESULT CAdTalkDef::LoadBuffer(byte *Buffer, bool Complete) { case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -210,18 +210,18 @@ HRESULT CAdTalkDef::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkDef::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdTalkDef::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "TALK {\n");
if (_defaultSpriteFilename) Buffer->PutTextIndent(Indent + 2, "DEFAULT_SPRITE=\"%s\"\n", _defaultSpriteFilename);
if (_defaultSpriteSetFilename) Buffer->PutTextIndent(Indent + 2, "DEFAULT_SPRITESET_FILE=\"%s\"\n", _defaultSpriteSetFilename);
- else if (_defaultSpriteSet) _defaultSpriteSet->SaveAsText(Buffer, Indent + 2);
+ else if (_defaultSpriteSet) _defaultSpriteSet->saveAsText(Buffer, Indent + 2);
for (int i = 0; i < _nodes.GetSize(); i++) {
- _nodes[i]->SaveAsText(Buffer, Indent + 2);
+ _nodes[i]->saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "\n");
}
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
diff --git a/engines/wintermute/Ad/AdTalkDef.h b/engines/wintermute/Ad/AdTalkDef.h index 08abcaf32b..870408f820 100644 --- a/engines/wintermute/Ad/AdTalkDef.h +++ b/engines/wintermute/Ad/AdTalkDef.h @@ -50,7 +50,7 @@ public: CBArray<CAdTalkNode *, CAdTalkNode *> _nodes;
char *_defaultSpriteFilename;
CBSprite *_defaultSprite;
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent = 0);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent = 0);
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp index a5022e32c5..222376dd8d 100644 --- a/engines/wintermute/Ad/AdTalkHolder.cpp +++ b/engines/wintermute/Ad/AdTalkHolder.cpp @@ -326,7 +326,7 @@ const char *CAdTalkHolder::scToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdTalkHolder::saveAsText(CBDynBuffer *Buffer, int Indent) {
int i;
for (i = 0; i < _talkSprites.GetSize(); i++) {
if (_talkSprites[i]->_filename)
diff --git a/engines/wintermute/Ad/AdTalkHolder.h b/engines/wintermute/Ad/AdTalkHolder.h index ec30decece..193dadfe00 100644 --- a/engines/wintermute/Ad/AdTalkHolder.h +++ b/engines/wintermute/Ad/AdTalkHolder.h @@ -37,7 +37,7 @@ class CAdTalkHolder : public CAdObject { public:
DECLARE_PERSISTENT(CAdTalkHolder, CAdObject)
virtual CBSprite *GetTalkStance(const char *Stance);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
CBSprite *_sprite;
CBArray<CBSprite *, CBSprite *> _talkSprites;
CBArray<CBSprite *, CBSprite *> _talkSpritesEx;
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp index bb6ff83efb..d9aeb2e85f 100644 --- a/engines/wintermute/Ad/AdTalkNode.cpp +++ b/engines/wintermute/Ad/AdTalkNode.cpp @@ -147,7 +147,7 @@ HRESULT CAdTalkNode::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -198,17 +198,17 @@ HRESULT CAdTalkNode::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkNode::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdTalkNode::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "ACTION {\n");
if (_comment) Buffer->PutTextIndent(Indent + 2, "COMMENT=\"%s\"\n", _comment);
Buffer->PutTextIndent(Indent + 2, "START_TIME=%d\n", _startTime);
if (!_playToEnd) Buffer->PutTextIndent(Indent + 2, "END_TIME=%d\n", _endTime);
if (_spriteFilename) Buffer->PutTextIndent(Indent + 2, "SPRITE=\"%s\"\n", _spriteFilename);
if (_spriteSetFilename) Buffer->PutTextIndent(Indent + 2, "SPRITESET_FILE=\"%s\"\n", _spriteSetFilename);
- else if (_spriteSet) _spriteSet->SaveAsText(Buffer, Indent + 2);
+ else if (_spriteSet) _spriteSet->saveAsText(Buffer, Indent + 2);
if (_preCache) Buffer->PutTextIndent(Indent + 2, "PRECACHE=\"%s\"\n", _preCache ? "TRUE" : "FALSE");
- CBBase::SaveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
Buffer->PutTextIndent(Indent, "}\n");
diff --git a/engines/wintermute/Ad/AdTalkNode.h b/engines/wintermute/Ad/AdTalkNode.h index 519b57add0..8d356181e8 100644 --- a/engines/wintermute/Ad/AdTalkNode.h +++ b/engines/wintermute/Ad/AdTalkNode.h @@ -47,7 +47,7 @@ public: CAdTalkNode(CBGame *inGame);
virtual ~CAdTalkNode();
HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent = 0);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent = 0);
char *_spriteFilename;
CBSprite *_sprite;
uint32 _startTime;
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp index 5f03fa7898..481f495880 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.cpp +++ b/engines/wintermute/Ad/AdWaypointGroup.cpp @@ -150,7 +150,7 @@ HRESULT CAdWaypointGroup::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_EDITOR_PROPERTY:
- ParseEditorProperty(params, false);
+ parseEditorProperty(params, false);
break;
}
}
@@ -164,14 +164,14 @@ HRESULT CAdWaypointGroup::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdWaypointGroup::SaveAsText(CBDynBuffer *Buffer, int Indent) {
+HRESULT CAdWaypointGroup::saveAsText(CBDynBuffer *Buffer, int Indent) {
Buffer->PutTextIndent(Indent, "WAYPOINTS {\n");
Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint);
- if (_scProp) _scProp->SaveAsText(Buffer, Indent + 2);
- CBBase::SaveAsText(Buffer, Indent + 2);
+ if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
+ CBBase::saveAsText(Buffer, Indent + 2);
for (int i = 0; i < _points.GetSize(); i++) {
Buffer->PutTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
diff --git a/engines/wintermute/Ad/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h index 00852fce41..1cf44716a5 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.h +++ b/engines/wintermute/Ad/AdWaypointGroup.h @@ -41,7 +41,7 @@ public: void Cleanup();
HRESULT Mimic(CAdWaypointGroup *Wpt, float Scale = 100.0f, int X = 0, int Y = 0);
DECLARE_PERSISTENT(CAdWaypointGroup, CBObject)
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
+ virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
bool _active;
CAdWaypointGroup(CBGame *inGame);
HRESULT LoadFile(const char *Filename);
|