diff options
27 files changed, 424 insertions, 424 deletions
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index 8b1cd0853d..d5e2fe954f 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -878,69 +878,69 @@ const char *CAdEntity::scToString() { //////////////////////////////////////////////////////////////////////////
HRESULT CAdEntity::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "ENTITY {\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent, "ENTITY {\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
if (_subtype == ENTITY_SOUND)
- Buffer->PutTextIndent(Indent + 2, "SUBTYPE=\"SOUND\"\n");
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "SCALABLE=%s\n", _zoomable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "INTERACTIVE=%s\n", _registrable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "COLORABLE=%s\n", _shadowable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "SUBTYPE=\"SOUND\"\n");
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "SCALABLE=%s\n", _zoomable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "INTERACTIVE=%s\n", _registrable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "COLORABLE=%s\n", _shadowable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
if (_ignoreItems)
- Buffer->PutTextIndent(Indent + 2, "IGNORE_ITEMS=%s\n", _ignoreItems ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "IGNORE_ITEMS=%s\n", _ignoreItems ? "TRUE" : "FALSE");
if (_rotatable)
- Buffer->PutTextIndent(Indent + 2, "ROTATABLE=%s\n", _rotatable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "ROTATABLE=%s\n", _rotatable ? "TRUE" : "FALSE");
if (!_autoSoundPanning)
- Buffer->PutTextIndent(Indent + 2, "SOUND_PANNING=%s\n", _autoSoundPanning ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "SOUND_PANNING=%s\n", _autoSoundPanning ? "TRUE" : "FALSE");
if (!_saveState)
- Buffer->PutTextIndent(Indent + 2, "SAVE_STATE=%s\n", _saveState ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "SAVE_STATE=%s\n", _saveState ? "TRUE" : "FALSE");
- if (_item && _item[0] != '\0') Buffer->PutTextIndent(Indent + 2, "ITEM=\"%s\"\n", _item);
+ if (_item && _item[0] != '\0') Buffer->putTextIndent(Indent + 2, "ITEM=\"%s\"\n", _item);
- Buffer->PutTextIndent(Indent + 2, "WALK_TO_X=%d\n", _walkToX);
- Buffer->PutTextIndent(Indent + 2, "WALK_TO_Y=%d\n", _walkToY);
+ Buffer->putTextIndent(Indent + 2, "WALK_TO_X=%d\n", _walkToX);
+ Buffer->putTextIndent(Indent + 2, "WALK_TO_Y=%d\n", _walkToY);
if (_walkToDir != DI_NONE)
- Buffer->PutTextIndent(Indent + 2, "WALK_TO_DIR=%d\n", (int)_walkToDir);
+ Buffer->putTextIndent(Indent + 2, "WALK_TO_DIR=%d\n", (int)_walkToDir);
int i;
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
if (_subtype == ENTITY_NORMAL && _sprite && _sprite->_filename)
- Buffer->PutTextIndent(Indent + 2, "SPRITE=\"%s\"\n", _sprite->_filename);
+ Buffer->putTextIndent(Indent + 2, "SPRITE=\"%s\"\n", _sprite->_filename);
if (_subtype == ENTITY_SOUND && _sFX && _sFX->_soundFilename) {
- Buffer->PutTextIndent(Indent + 2, "SOUND=\"%s\"\n", _sFX->_soundFilename);
- Buffer->PutTextIndent(Indent + 2, "SOUND_START_TIME=%d\n", _sFXStart);
- Buffer->PutTextIndent(Indent + 2, "SOUND_VOLUME=%d\n", _sFXVolume);
+ Buffer->putTextIndent(Indent + 2, "SOUND=\"%s\"\n", _sFX->_soundFilename);
+ Buffer->putTextIndent(Indent + 2, "SOUND_START_TIME=%d\n", _sFXStart);
+ Buffer->putTextIndent(Indent + 2, "SOUND_VOLUME=%d\n", _sFXVolume);
}
if (D3DCOLGetR(_alphaColor) != 0 || D3DCOLGetG(_alphaColor) != 0 || D3DCOLGetB(_alphaColor) != 0)
- Buffer->PutTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alphaColor), D3DCOLGetG(_alphaColor), D3DCOLGetB(_alphaColor));
+ Buffer->putTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alphaColor), D3DCOLGetG(_alphaColor), D3DCOLGetB(_alphaColor));
if (D3DCOLGetA(_alphaColor) != 0)
- Buffer->PutTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alphaColor));
+ Buffer->putTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alphaColor));
if (_scale >= 0)
- Buffer->PutTextIndent(Indent + 2, "SCALE = %d\n", (int)_scale);
+ Buffer->putTextIndent(Indent + 2, "SCALE = %d\n", (int)_scale);
if (_relativeScale != 0)
- Buffer->PutTextIndent(Indent + 2, "RELATIVE_SCALE = %d\n", (int)_relativeScale);
+ Buffer->putTextIndent(Indent + 2, "RELATIVE_SCALE = %d\n", (int)_relativeScale);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
CAdTalkHolder::saveAsText(Buffer, Indent + 2);
@@ -950,7 +950,7 @@ HRESULT CAdEntity::saveAsText(CBDynBuffer *Buffer, int Indent) { CAdObject::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp index 55214f51ce..9c2d5bbcfc 100644 --- a/engines/wintermute/Ad/AdInventoryBox.cpp +++ b/engines/wintermute/Ad/AdInventoryBox.cpp @@ -318,33 +318,33 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdInventoryBox::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "INVENTORY_BOX\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "INVENTORY_BOX\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "AREA { %d, %d, %d, %d }\n", _itemsArea.left, _itemsArea.top, _itemsArea.right, _itemsArea.bottom);
+ Buffer->putTextIndent(Indent + 2, "AREA { %d, %d, %d, %d }\n", _itemsArea.left, _itemsArea.top, _itemsArea.right, _itemsArea.bottom);
- Buffer->PutTextIndent(Indent + 2, "EXCLUSIVE=%s\n", _exclusive ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "HIDE_SELECTED=%s\n", _hideSelected ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "ALWAYS_VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "SPACING=%d\n", _spacing);
- Buffer->PutTextIndent(Indent + 2, "ITEM_WIDTH=%d\n", _itemWidth);
- Buffer->PutTextIndent(Indent + 2, "ITEM_HEIGHT=%d\n", _itemHeight);
- Buffer->PutTextIndent(Indent + 2, "SCROLL_BY=%d\n", _scrollBy);
+ Buffer->putTextIndent(Indent + 2, "EXCLUSIVE=%s\n", _exclusive ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "HIDE_SELECTED=%s\n", _hideSelected ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "ALWAYS_VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "SPACING=%d\n", _spacing);
+ Buffer->putTextIndent(Indent + 2, "ITEM_WIDTH=%d\n", _itemWidth);
+ Buffer->putTextIndent(Indent + 2, "ITEM_HEIGHT=%d\n", _itemHeight);
+ Buffer->putTextIndent(Indent + 2, "SCROLL_BY=%d\n", _scrollBy);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// window
if (_window) _window->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp index c5d24898cd..0967fd74c9 100644 --- a/engines/wintermute/Ad/AdLayer.cpp +++ b/engines/wintermute/Ad/AdLayer.cpp @@ -479,21 +479,21 @@ const char *CAdLayer::scToString() { //////////////////////////////////////////////////////////////////////////
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());
- Buffer->PutTextIndent(Indent + 2, "MAIN=%s\n", _main ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width);
- Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
- Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent, "LAYER {\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "MAIN=%s\n", _main ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "WIDTH=%d\n", _width);
+ Buffer->putTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
+ Buffer->putTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
if (_closeUp)
- Buffer->PutTextIndent(Indent + 2, "CLOSE_UP=%s\n", _closeUp ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "CLOSE_UP=%s\n", _closeUp ? "TRUE" : "FALSE");
int i;
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
@@ -514,7 +514,7 @@ HRESULT CAdLayer::saveAsText(CBDynBuffer *Buffer, int Indent) { CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp index df124e7692..d7346665e5 100644 --- a/engines/wintermute/Ad/AdRegion.cpp +++ b/engines/wintermute/Ad/AdRegion.cpp @@ -347,31 +347,31 @@ const char *CAdRegion::scToString() { //////////////////////////////////////////////////////////////////////////
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());
- Buffer->PutTextIndent(Indent + 2, "BLOCKED=%s\n", _blocked ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "DECORATION=%s\n", _decoration ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "SCALE=%d\n", (int)_zoom);
- Buffer->PutTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alpha), D3DCOLGetG(_alpha), D3DCOLGetB(_alpha));
- Buffer->PutTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alpha));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent, "REGION {\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "BLOCKED=%s\n", _blocked ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DECORATION=%s\n", _decoration ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "SCALE=%d\n", (int)_zoom);
+ Buffer->putTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alpha), D3DCOLGetG(_alpha), D3DCOLGetB(_alpha));
+ Buffer->putTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alpha));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
int i;
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
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);
+ Buffer->putTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index d62324e4b1..39caffe00f 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -336,30 +336,30 @@ HRESULT CAdResponseBox::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdResponseBox::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "RESPONSE_BOX\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "RESPONSE_BOX\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "AREA { %d, %d, %d, %d }\n", _responseArea.left, _responseArea.top, _responseArea.right, _responseArea.bottom);
+ Buffer->putTextIndent(Indent + 2, "AREA { %d, %d, %d, %d }\n", _responseArea.left, _responseArea.top, _responseArea.right, _responseArea.bottom);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_fontHover && _fontHover->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_HOVER=\"%s\"\n", _fontHover->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_HOVER=\"%s\"\n", _fontHover->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
- Buffer->PutTextIndent(Indent + 2, "HORIZONTAL=%s\n", _horizontal ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "HORIZONTAL=%s\n", _horizontal ? "TRUE" : "FALSE");
switch (_align) {
case TAL_LEFT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
break;
case TAL_RIGHT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
break;
case TAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
error("CAdResponseBox::SaveAsText - Unhandled enum");
@@ -368,29 +368,29 @@ HRESULT CAdResponseBox::saveAsText(CBDynBuffer *Buffer, int Indent) { switch (_verticalAlign) {
case VAL_TOP:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
break;
case VAL_BOTTOM:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "bottom");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "bottom");
break;
case VAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
break;
}
- Buffer->PutTextIndent(Indent + 2, "SPACING=%d\n", _spacing);
+ Buffer->putTextIndent(Indent + 2, "SPACING=%d\n", _spacing);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// window
if (_window) _window->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp index 4f20973958..e2d82ed952 100644 --- a/engines/wintermute/Ad/AdRotLevel.cpp +++ b/engines/wintermute/Ad/AdRotLevel.cpp @@ -136,11 +136,11 @@ HRESULT CAdRotLevel::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
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);
+ 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);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp index 68cccac35a..3ed0d93f46 100644 --- a/engines/wintermute/Ad/AdScaleLevel.cpp +++ b/engines/wintermute/Ad/AdScaleLevel.cpp @@ -134,11 +134,11 @@ HRESULT CAdScaleLevel::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
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);
+ 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);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index 0acc081c27..fe3820d574 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -1972,24 +1972,24 @@ HRESULT CAdScene::RemoveObject(CAdObject *Object) { HRESULT CAdScene::saveAsText(CBDynBuffer *Buffer, int Indent) {
int i;
- Buffer->PutTextIndent(Indent, "SCENE {\n");
+ Buffer->putTextIndent(Indent, "SCENE {\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
if (_persistentState)
- Buffer->PutTextIndent(Indent + 2, "PERSISTENT_STATE=%s\n", _persistentState ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PERSISTENT_STATE=%s\n", _persistentState ? "TRUE" : "FALSE");
if (!_persistentStateSprites)
- Buffer->PutTextIndent(Indent + 2, "PERSISTENT_STATE_SPRITES=%s\n", _persistentStateSprites ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PERSISTENT_STATE_SPRITES=%s\n", _persistentStateSprites ? "TRUE" : "FALSE");
// scripts
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// properties
if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
@@ -1997,61 +1997,61 @@ HRESULT CAdScene::saveAsText(CBDynBuffer *Buffer, int Indent) { // viewport
if (_viewport) {
RECT *rc = _viewport->getRect();
- Buffer->PutTextIndent(Indent + 2, "VIEWPORT { %d, %d, %d, %d }\n", rc->left, rc->top, rc->right, rc->bottom);
+ Buffer->putTextIndent(Indent + 2, "VIEWPORT { %d, %d, %d, %d }\n", rc->left, rc->top, rc->right, rc->bottom);
}
// editor settings
- Buffer->PutTextIndent(Indent + 2, "; ----- editor settings\n");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_MARGIN_H=%d\n", _editorMarginH);
- Buffer->PutTextIndent(Indent + 2, "EDITOR_MARGIN_V=%d\n", _editorMarginV);
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_FRAME { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColFrame), D3DCOLGetG(_editorColFrame), D3DCOLGetB(_editorColFrame), D3DCOLGetA(_editorColFrame));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_ENTITY_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColEntitySel), D3DCOLGetG(_editorColEntitySel), D3DCOLGetB(_editorColEntitySel), D3DCOLGetA(_editorColEntitySel));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_REGION_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColRegionSel), D3DCOLGetG(_editorColRegionSel), D3DCOLGetB(_editorColRegionSel), D3DCOLGetA(_editorColRegionSel));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_BLOCKED_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColBlockedSel), D3DCOLGetG(_editorColBlockedSel), D3DCOLGetB(_editorColBlockedSel), D3DCOLGetA(_editorColBlockedSel));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_DECORATION_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColDecorSel), D3DCOLGetG(_editorColDecorSel), D3DCOLGetB(_editorColDecorSel), D3DCOLGetA(_editorColDecorSel));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_WAYPOINTS_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColWaypointsSel), D3DCOLGetG(_editorColWaypointsSel), D3DCOLGetB(_editorColWaypointsSel), D3DCOLGetA(_editorColWaypointsSel));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_ENTITY { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColEntity), D3DCOLGetG(_editorColEntity), D3DCOLGetB(_editorColEntity), D3DCOLGetA(_editorColEntity));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_REGION { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColRegion), D3DCOLGetG(_editorColRegion), D3DCOLGetB(_editorColRegion), D3DCOLGetA(_editorColRegion));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_DECORATION { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColDecor), D3DCOLGetG(_editorColDecor), D3DCOLGetB(_editorColDecor), D3DCOLGetA(_editorColDecor));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_BLOCKED { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColBlocked), D3DCOLGetG(_editorColBlocked), D3DCOLGetB(_editorColBlocked), D3DCOLGetA(_editorColBlocked));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_WAYPOINTS { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColWaypoints), D3DCOLGetG(_editorColWaypoints), D3DCOLGetB(_editorColWaypoints), D3DCOLGetA(_editorColWaypoints));
- Buffer->PutTextIndent(Indent + 2, "EDITOR_COLOR_SCALE { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColScale), D3DCOLGetG(_editorColScale), D3DCOLGetB(_editorColScale), D3DCOLGetA(_editorColScale));
-
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SHOW_REGIONS=%s\n", _editorShowRegions ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SHOW_BLOCKED=%s\n", _editorShowBlocked ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SHOW_DECORATION=%s\n", _editorShowDecor ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SHOW_ENTITIES=%s\n", _editorShowEntities ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SHOW_SCALE=%s\n", _editorShowScale ? "TRUE" : "FALSE");
-
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "; ----- editor settings\n");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_MARGIN_H=%d\n", _editorMarginH);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_MARGIN_V=%d\n", _editorMarginV);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_FRAME { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColFrame), D3DCOLGetG(_editorColFrame), D3DCOLGetB(_editorColFrame), D3DCOLGetA(_editorColFrame));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_ENTITY_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColEntitySel), D3DCOLGetG(_editorColEntitySel), D3DCOLGetB(_editorColEntitySel), D3DCOLGetA(_editorColEntitySel));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_REGION_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColRegionSel), D3DCOLGetG(_editorColRegionSel), D3DCOLGetB(_editorColRegionSel), D3DCOLGetA(_editorColRegionSel));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_BLOCKED_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColBlockedSel), D3DCOLGetG(_editorColBlockedSel), D3DCOLGetB(_editorColBlockedSel), D3DCOLGetA(_editorColBlockedSel));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_DECORATION_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColDecorSel), D3DCOLGetG(_editorColDecorSel), D3DCOLGetB(_editorColDecorSel), D3DCOLGetA(_editorColDecorSel));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_WAYPOINTS_SEL { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColWaypointsSel), D3DCOLGetG(_editorColWaypointsSel), D3DCOLGetB(_editorColWaypointsSel), D3DCOLGetA(_editorColWaypointsSel));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_ENTITY { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColEntity), D3DCOLGetG(_editorColEntity), D3DCOLGetB(_editorColEntity), D3DCOLGetA(_editorColEntity));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_REGION { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColRegion), D3DCOLGetG(_editorColRegion), D3DCOLGetB(_editorColRegion), D3DCOLGetA(_editorColRegion));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_DECORATION { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColDecor), D3DCOLGetG(_editorColDecor), D3DCOLGetB(_editorColDecor), D3DCOLGetA(_editorColDecor));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_BLOCKED { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColBlocked), D3DCOLGetG(_editorColBlocked), D3DCOLGetB(_editorColBlocked), D3DCOLGetA(_editorColBlocked));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_WAYPOINTS { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColWaypoints), D3DCOLGetG(_editorColWaypoints), D3DCOLGetB(_editorColWaypoints), D3DCOLGetA(_editorColWaypoints));
+ Buffer->putTextIndent(Indent + 2, "EDITOR_COLOR_SCALE { %d,%d,%d,%d }\n", D3DCOLGetR(_editorColScale), D3DCOLGetG(_editorColScale), D3DCOLGetB(_editorColScale), D3DCOLGetA(_editorColScale));
+
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SHOW_REGIONS=%s\n", _editorShowRegions ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SHOW_BLOCKED=%s\n", _editorShowBlocked ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SHOW_DECORATION=%s\n", _editorShowDecor ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SHOW_ENTITIES=%s\n", _editorShowEntities ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SHOW_SCALE=%s\n", _editorShowScale ? "TRUE" : "FALSE");
+
+ Buffer->putTextIndent(Indent + 2, "\n");
CBBase::saveAsText(Buffer, Indent + 2);
// waypoints
- Buffer->PutTextIndent(Indent + 2, "; ----- waypoints\n");
+ Buffer->putTextIndent(Indent + 2, "; ----- waypoints\n");
for (i = 0; i < _waypointGroups.GetSize(); i++) _waypointGroups[i]->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// layers
- Buffer->PutTextIndent(Indent + 2, "; ----- layers\n");
+ Buffer->putTextIndent(Indent + 2, "; ----- layers\n");
for (i = 0; i < _layers.GetSize(); i++) _layers[i]->saveAsText(Buffer, Indent + 2);
// scale levels
- Buffer->PutTextIndent(Indent + 2, "; ----- scale levels\n");
+ Buffer->putTextIndent(Indent + 2, "; ----- scale levels\n");
for (i = 0; i < _scaleLevels.GetSize(); i++) _scaleLevels[i]->saveAsText(Buffer, Indent + 2);
// rotation levels
- Buffer->PutTextIndent(Indent + 2, "; ----- rotation levels\n");
+ Buffer->putTextIndent(Indent + 2, "; ----- rotation levels\n");
for (i = 0; i < _rotLevels.GetSize(); i++) _rotLevels[i]->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// free entities
- Buffer->PutTextIndent(Indent + 2, "; ----- free entities\n");
+ 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);
@@ -2061,7 +2061,7 @@ HRESULT CAdScene::saveAsText(CBDynBuffer *Buffer, int Indent) { - Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp index 62787b6c68..3eb30e2496 100644 --- a/engines/wintermute/Ad/AdSpriteSet.cpp +++ b/engines/wintermute/Ad/AdSpriteSet.cpp @@ -260,34 +260,34 @@ CBSprite *CAdSpriteSet::GetSprite(TDirection Direction) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdSpriteSet::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "SPRITESET {\n");
- if (_name) Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent, "SPRITESET {\n");
+ if (_name) Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
for (int i = 0; i < NUM_DIRECTIONS; i++) {
if (_sprites[i]) {
switch (i) {
case DI_UP:
- Buffer->PutTextIndent(Indent + 2, "UP=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "UP=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_UPRIGHT:
- Buffer->PutTextIndent(Indent + 2, "UP_RIGHT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "UP_RIGHT=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_RIGHT:
- Buffer->PutTextIndent(Indent + 2, "RIGHT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "RIGHT=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_DOWNRIGHT:
- Buffer->PutTextIndent(Indent + 2, "DOWN_RIGHT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "DOWN_RIGHT=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_DOWN:
- Buffer->PutTextIndent(Indent + 2, "DOWN=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "DOWN=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_DOWNLEFT:
- Buffer->PutTextIndent(Indent + 2, "DOWN_LEFT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "DOWN_LEFT=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_LEFT:
- Buffer->PutTextIndent(Indent + 2, "LEFT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "LEFT=\"%s\"\n", _sprites[i]->_filename);
break;
case DI_UPLEFT:
- Buffer->PutTextIndent(Indent + 2, "UP_LEFT=\"%s\"\n", _sprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "UP_LEFT=\"%s\"\n", _sprites[i]->_filename);
break;
}
}
@@ -295,7 +295,7 @@ HRESULT CAdSpriteSet::saveAsText(CBDynBuffer *Buffer, int Indent) { CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp index 8aa3d3523f..8b485f2092 100644 --- a/engines/wintermute/Ad/AdTalkDef.cpp +++ b/engines/wintermute/Ad/AdTalkDef.cpp @@ -211,19 +211,19 @@ HRESULT CAdTalkDef::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdTalkDef::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "TALK {\n");
- if (_defaultSpriteFilename) Buffer->PutTextIndent(Indent + 2, "DEFAULT_SPRITE=\"%s\"\n", _defaultSpriteFilename);
+ 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);
+ if (_defaultSpriteSetFilename) Buffer->putTextIndent(Indent + 2, "DEFAULT_SPRITESET_FILE=\"%s\"\n", _defaultSpriteSetFilename);
else if (_defaultSpriteSet) _defaultSpriteSet->saveAsText(Buffer, Indent + 2);
for (int i = 0; i < _nodes.GetSize(); i++) {
_nodes[i]->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "\n");
+ Buffer->putTextIndent(Indent, "\n");
}
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp index 222376dd8d..204de117b6 100644 --- a/engines/wintermute/Ad/AdTalkHolder.cpp +++ b/engines/wintermute/Ad/AdTalkHolder.cpp @@ -330,12 +330,12 @@ HRESULT CAdTalkHolder::saveAsText(CBDynBuffer *Buffer, int Indent) { int i;
for (i = 0; i < _talkSprites.GetSize(); i++) {
if (_talkSprites[i]->_filename)
- Buffer->PutTextIndent(Indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->_filename);
}
for (i = 0; i < _talkSpritesEx.GetSize(); i++) {
if (_talkSpritesEx[i]->_filename)
- Buffer->PutTextIndent(Indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->_filename);
}
return S_OK;
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp index d9aeb2e85f..9f9264113b 100644 --- a/engines/wintermute/Ad/AdTalkNode.cpp +++ b/engines/wintermute/Ad/AdTalkNode.cpp @@ -199,18 +199,18 @@ HRESULT CAdTalkNode::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
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);
+ 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);
- if (_preCache) Buffer->PutTextIndent(Indent + 2, "PRECACHE=\"%s\"\n", _preCache ? "TRUE" : "FALSE");
+ if (_preCache) Buffer->putTextIndent(Indent + 2, "PRECACHE=\"%s\"\n", _preCache ? "TRUE" : "FALSE");
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp index dc0059cf40..c2613d4cd7 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.cpp +++ b/engines/wintermute/Ad/AdWaypointGroup.cpp @@ -165,19 +165,19 @@ HRESULT CAdWaypointGroup::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
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);
+ 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);
for (int i = 0; i < _points.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
+ Buffer->putTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/Base/BBase.cpp b/engines/wintermute/Base/BBase.cpp index afae06af68..bcd6a43e23 100644 --- a/engines/wintermute/Base/BBase.cpp +++ b/engines/wintermute/Base/BBase.cpp @@ -161,13 +161,13 @@ HRESULT CBBase::parseEditorProperty(byte *Buffer, bool Complete) { HRESULT CBBase::saveAsText(CBDynBuffer *Buffer, int Indent) {
_editorPropsIter = _editorProps.begin();
while (_editorPropsIter != _editorProps.end()) {
- Buffer->PutTextIndent(Indent, "EDITOR_PROPERTY\n");
- Buffer->PutTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _editorPropsIter->_key.c_str());
- Buffer->PutTextIndent(Indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->_value.c_str());
- //Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", (char *)_editorPropsIter->first.c_str()); // <- TODO, remove
- //Buffer->PutTextIndent(Indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->second.c_str()); // <- TODO, remove
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "EDITOR_PROPERTY\n");
+ Buffer->putTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _editorPropsIter->_key.c_str());
+ Buffer->putTextIndent(Indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->_value.c_str());
+ //Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", (char *)_editorPropsIter->first.c_str()); // <- TODO, remove
+ //Buffer->putTextIndent(Indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->second.c_str()); // <- TODO, remove
+ Buffer->putTextIndent(Indent, "}\n\n");
_editorPropsIter++;
}
diff --git a/engines/wintermute/Base/BDynBuffer.cpp b/engines/wintermute/Base/BDynBuffer.cpp index 4a498fb3dd..7a4a5afeec 100644 --- a/engines/wintermute/Base/BDynBuffer.cpp +++ b/engines/wintermute/Base/BDynBuffer.cpp @@ -32,14 +32,14 @@ namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-CBDynBuffer::CBDynBuffer(CBGame *inGame, uint32 InitSize, uint32 GrowBy): CBBase(inGame) {
+CBDynBuffer::CBDynBuffer(CBGame *inGame, uint32 initSize, uint32 growBy): CBBase(inGame) {
_buffer = NULL;
_size = 0;
_realSize = 0;
_offset = 0;
- _initSize = InitSize;
- _growBy = GrowBy;
+ _initSize = initSize;
+ _growBy = growBy;
_initialized = false;
}
@@ -63,24 +63,24 @@ void CBDynBuffer::cleanup() { //////////////////////////////////////////////////////////////////////////
-uint32 CBDynBuffer::GetSize() {
+uint32 CBDynBuffer::getSize() {
return _size;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBDynBuffer::Init(uint32 InitSize) {
+HRESULT CBDynBuffer::init(uint32 initSize) {
cleanup();
- if (InitSize == 0) InitSize = _initSize;
+ if (initSize == 0) initSize = _initSize;
- _buffer = (byte *)malloc(InitSize);
+ _buffer = (byte *)malloc(initSize);
if (!_buffer) {
- Game->LOG(0, "CBDynBuffer::Init - Error allocating %d bytes", InitSize);
+ Game->LOG(0, "CBDynBuffer::Init - Error allocating %d bytes", initSize);
return E_FAIL;
}
- _realSize = InitSize;
+ _realSize = initSize;
_initialized = true;
return S_OK;
@@ -88,10 +88,10 @@ HRESULT CBDynBuffer::Init(uint32 InitSize) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBDynBuffer::PutBytes(byte *Buffer, uint32 Size) {
- if (!_initialized) Init();
+HRESULT CBDynBuffer::putBytes(byte *buffer, uint32 size) {
+ if (!_initialized) init();
- while (_offset + Size > _realSize) {
+ while (_offset + size > _realSize) {
_realSize += _growBy;
_buffer = (byte *)realloc(_buffer, _realSize);
if (!_buffer) {
@@ -100,57 +100,57 @@ HRESULT CBDynBuffer::PutBytes(byte *Buffer, uint32 Size) { }
}
- memcpy(_buffer + _offset, Buffer, Size);
- _offset += Size;
- _size += Size;
+ memcpy(_buffer + _offset, buffer, size);
+ _offset += size;
+ _size += size;
return S_OK;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBDynBuffer::GetBytes(byte *Buffer, uint32 Size) {
- if (!_initialized) Init();
+HRESULT CBDynBuffer::getBytes(byte *buffer, uint32 size) {
+ if (!_initialized) init();
- if (_offset + Size > _size) {
+ if (_offset + size > _size) {
Game->LOG(0, "CBDynBuffer::GetBytes - Buffer underflow");
return E_FAIL;
}
- memcpy(Buffer, _buffer + _offset, Size);
- _offset += Size;
+ memcpy(buffer, _buffer + _offset, size);
+ _offset += size;
return S_OK;
}
//////////////////////////////////////////////////////////////////////////
-void CBDynBuffer::PutDWORD(uint32 Val) {
- PutBytes((byte *)&Val, sizeof(uint32));
+void CBDynBuffer::putDWORD(uint32 val) {
+ putBytes((byte *)&val, sizeof(uint32));
}
//////////////////////////////////////////////////////////////////////////
-uint32 CBDynBuffer::GetDWORD() {
+uint32 CBDynBuffer::getDWORD() {
uint32 ret;
- GetBytes((byte *)&ret, sizeof(uint32));
+ getBytes((byte *)&ret, sizeof(uint32));
return ret;
}
//////////////////////////////////////////////////////////////////////////
-void CBDynBuffer::PutString(const char *Val) {
- if (!Val) PutString("(null)");
+void CBDynBuffer::putString(const char *val) {
+ if (!val) putString("(null)");
else {
- PutDWORD(strlen(Val) + 1);
- PutBytes((byte *)Val, strlen(Val) + 1);
+ putDWORD(strlen(val) + 1);
+ putBytes((byte *)val, strlen(val) + 1);
}
}
//////////////////////////////////////////////////////////////////////////
-char *CBDynBuffer::GetString() {
- uint32 len = GetDWORD();
+char *CBDynBuffer::getString() {
+ uint32 len = getDWORD();
char *ret = (char *)(_buffer + _offset);
_offset += len;
@@ -160,7 +160,7 @@ char *CBDynBuffer::GetString() { //////////////////////////////////////////////////////////////////////////
-void CBDynBuffer::PutText(LPCSTR fmt, ...) {
+void CBDynBuffer::putText(LPCSTR fmt, ...) {
va_list va;
va_start(va, fmt);
@@ -171,10 +171,10 @@ void CBDynBuffer::PutText(LPCSTR fmt, ...) { //////////////////////////////////////////////////////////////////////////
-void CBDynBuffer::PutTextIndent(int Indent, LPCSTR fmt, ...) {
+void CBDynBuffer::putTextIndent(int indent, LPCSTR fmt, ...) {
va_list va;
- PutText("%*s", Indent, "");
+ putText("%*s", indent, "");
va_start(va, fmt);
PutTextForm(fmt, va);
@@ -186,7 +186,7 @@ void CBDynBuffer::PutTextIndent(int Indent, LPCSTR fmt, ...) { void CBDynBuffer::PutTextForm(const char *format, va_list argptr) {
char buff[32768];
vsprintf(buff, format, argptr);
- PutBytes((byte *)buff, strlen(buff));
+ putBytes((byte *)buff, strlen(buff));
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BDynBuffer.h b/engines/wintermute/Base/BDynBuffer.h index 626ce04314..4d11b2fe6a 100644 --- a/engines/wintermute/Base/BDynBuffer.h +++ b/engines/wintermute/Base/BDynBuffer.h @@ -37,20 +37,20 @@ namespace WinterMute { class CBDynBuffer : public CBBase {
public:
bool _initialized;
- void PutText(LPCSTR fmt, ...);
- void PutTextIndent(int Indent, LPCSTR fmt, ...);
- uint32 GetDWORD();
- void PutDWORD(uint32 Val);
- char *GetString();
- void PutString(const char *Val);
- HRESULT GetBytes(byte *Buffer, uint32 Size);
- HRESULT PutBytes(byte *Buffer, uint32 Size);
- uint32 GetSize();
- HRESULT Init(uint32 InitSize = 0);
+ void putText(LPCSTR fmt, ...);
+ void putTextIndent(int indent, LPCSTR fmt, ...);
+ uint32 getDWORD();
+ void putDWORD(uint32 val);
+ char *getString();
+ void putString(const char *val);
+ HRESULT getBytes(byte *buffer, uint32 size);
+ HRESULT putBytes(byte *buffer, uint32 size);
+ uint32 getSize();
+ HRESULT init(uint32 initSize = 0);
void cleanup();
uint32 _size;
byte *_buffer;
- CBDynBuffer(CBGame *inGame, uint32 InitSize = 1000, uint32 GrowBy = 1000);
+ CBDynBuffer(CBGame *inGame, uint32 initSize = 1000, uint32 growBy = 1000);
virtual ~CBDynBuffer();
private:
diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp index 8e05d865fd..35e6ca814b 100644 --- a/engines/wintermute/Base/BFrame.cpp +++ b/engines/wintermute/Base/BFrame.cpp @@ -343,22 +343,22 @@ bool CBFrame::GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float Sca //////////////////////////////////////////////////////////////////////////
HRESULT CBFrame::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "FRAME {\n");
- Buffer->PutTextIndent(Indent + 2, "DELAY = %d\n", _delay);
+ Buffer->putTextIndent(Indent, "FRAME {\n");
+ Buffer->putTextIndent(Indent + 2, "DELAY = %d\n", _delay);
if (_moveX != 0 || _moveY != 0)
- Buffer->PutTextIndent(Indent + 2, "MOVE {%d, %d}\n", _moveX, _moveY);
+ Buffer->putTextIndent(Indent + 2, "MOVE {%d, %d}\n", _moveX, _moveY);
if (_sound && _sound->_soundFilename)
- Buffer->PutTextIndent(Indent + 2, "SOUND=\"%s\"\n", _sound->_soundFilename);
+ Buffer->putTextIndent(Indent + 2, "SOUND=\"%s\"\n", _sound->_soundFilename);
- Buffer->PutTextIndent(Indent + 2, "KEYFRAME=%s\n", _keyframe ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "KEYFRAME=%s\n", _keyframe ? "TRUE" : "FALSE");
if (_killSound)
- Buffer->PutTextIndent(Indent + 2, "KILL_SOUND=%s\n", _killSound ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "KILL_SOUND=%s\n", _killSound ? "TRUE" : "FALSE");
if (_editorExpanded)
- Buffer->PutTextIndent(Indent + 2, "EDITOR_EXPANDED=%s\n", _editorExpanded ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_EXPANDED=%s\n", _editorExpanded ? "TRUE" : "FALSE");
if (_subframes.GetSize() > 0) _subframes[0]->saveAsText(Buffer, Indent, false);
@@ -368,13 +368,13 @@ HRESULT CBFrame::saveAsText(CBDynBuffer *Buffer, int Indent) { }
for (i = 0; i < _applyEvent.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "APPLY_EVENT=\"%s\"\n", _applyEvent[i]);
+ Buffer->putTextIndent(Indent + 2, "APPLY_EVENT=\"%s\"\n", _applyEvent[i]);
}
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp index 8a0600792d..c66ee67e17 100644 --- a/engines/wintermute/Base/BRegion.cpp +++ b/engines/wintermute/Base/BRegion.cpp @@ -379,27 +379,27 @@ const char *CBRegion::scToString() { //////////////////////////////////////////////////////////////////////////
HRESULT CBRegion::saveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride) {
- if (!NameOverride) Buffer->PutTextIndent(Indent, "REGION {\n");
- else Buffer->PutTextIndent(Indent, "%s {\n", NameOverride);
+ if (!NameOverride) Buffer->putTextIndent(Indent, "REGION {\n");
+ else Buffer->putTextIndent(Indent, "%s {\n", NameOverride);
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint);
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint);
int i;
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
for (i = 0; i < _points.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
+ Buffer->putTextIndent(Indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
if (_scProp) _scProp->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index efe07505eb..6ec19c6ba3 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -429,26 +429,26 @@ bool CBSprite::GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float Sc //////////////////////////////////////////////////////////////////////////
HRESULT CBSprite::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "SPRITE {\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "LOOPING=%s\n", _looping ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "CONTINUOUS=%s\n", _continuous ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PRECISE=%s\n", _precise ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent, "SPRITE {\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "LOOPING=%s\n", _looping ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "CONTINUOUS=%s\n", _continuous ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PRECISE=%s\n", _precise ? "TRUE" : "FALSE");
if (_streamed) {
- Buffer->PutTextIndent(Indent + 2, "STREAMED=%s\n", _streamed ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "STREAMED=%s\n", _streamed ? "TRUE" : "FALSE");
if (_streamedKeepLoaded)
- Buffer->PutTextIndent(Indent + 2, "STREAMED_KEEP_LOADED=%s\n", _streamedKeepLoaded ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "STREAMED_KEEP_LOADED=%s\n", _streamedKeepLoaded ? "TRUE" : "FALSE");
}
if (_editorMuted)
- Buffer->PutTextIndent(Indent + 2, "EDITOR_MUTED=%s\n", _editorMuted ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_MUTED=%s\n", _editorMuted ? "TRUE" : "FALSE");
if (_editorBgFile) {
- Buffer->PutTextIndent(Indent + 2, "EDITOR_BG_FILE=\"%s\"\n", _editorBgFile);
- Buffer->PutTextIndent(Indent + 2, "EDITOR_BG_OFFSET_X=%d\n", _editorBgOffsetX);
- Buffer->PutTextIndent(Indent + 2, "EDITOR_BG_OFFSET_Y=%d\n", _editorBgOffsetY);
- Buffer->PutTextIndent(Indent + 2, "EDITOR_BG_ALPHA=%d\n", _editorBgAlpha);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_BG_FILE=\"%s\"\n", _editorBgFile);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_BG_OFFSET_X=%d\n", _editorBgOffsetX);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_BG_OFFSET_Y=%d\n", _editorBgOffsetY);
+ Buffer->putTextIndent(Indent + 2, "EDITOR_BG_ALPHA=%d\n", _editorBgAlpha);
}
CBScriptHolder::saveAsText(Buffer, Indent + 2);
@@ -457,7 +457,7 @@ HRESULT CBSprite::saveAsText(CBDynBuffer *Buffer, int Indent) { // scripts
for (i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
@@ -465,7 +465,7 @@ HRESULT CBSprite::saveAsText(CBDynBuffer *Buffer, int Indent) { _frames[i]->saveAsText(Buffer, Indent + 2);
}
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp index 127c4a7bba..f86d654980 100644 --- a/engines/wintermute/Base/BSubFrame.cpp +++ b/engines/wintermute/Base/BSubFrame.cpp @@ -251,51 +251,51 @@ bool CBSubFrame::getBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float //////////////////////////////////////////////////////////////////////////
HRESULT CBSubFrame::saveAsText(CBDynBuffer *Buffer, int Indent, bool Complete) {
if (Complete)
- Buffer->PutTextIndent(Indent, "SUBFRAME {\n");
+ Buffer->putTextIndent(Indent, "SUBFRAME {\n");
if (_surface && _surface->_filename != NULL)
- Buffer->PutTextIndent(Indent + 2, "IMAGE = \"%s\"\n", _surface->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE = \"%s\"\n", _surface->_filename);
if (_transparent != 0xFFFF00FF)
- Buffer->PutTextIndent(Indent + 2, "TRANSPARENT { %d,%d,%d }\n", D3DCOLGetR(_transparent), D3DCOLGetG(_transparent), D3DCOLGetB(_transparent));
+ Buffer->putTextIndent(Indent + 2, "TRANSPARENT { %d,%d,%d }\n", D3DCOLGetR(_transparent), D3DCOLGetG(_transparent), D3DCOLGetB(_transparent));
RECT rect;
CBPlatform::SetRectEmpty(&rect);
if (_surface) CBPlatform::SetRect(&rect, 0, 0, _surface->getWidth(), _surface->getHeight());
if (!CBPlatform::EqualRect(&rect, &_rect))
- Buffer->PutTextIndent(Indent + 2, "RECT { %d,%d,%d,%d }\n", _rect.left, _rect.top, _rect.right, _rect.bottom);
+ Buffer->putTextIndent(Indent + 2, "RECT { %d,%d,%d,%d }\n", _rect.left, _rect.top, _rect.right, _rect.bottom);
if (_hotspotX != 0 || _hotspotY != 0)
- Buffer->PutTextIndent(Indent + 2, "HOTSPOT {%d, %d}\n", _hotspotX, _hotspotY);
+ Buffer->putTextIndent(Indent + 2, "HOTSPOT {%d, %d}\n", _hotspotX, _hotspotY);
if (_alpha != 0xFFFFFFFF) {
- Buffer->PutTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alpha), D3DCOLGetG(_alpha), D3DCOLGetB(_alpha));
- Buffer->PutTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alpha));
+ Buffer->putTextIndent(Indent + 2, "ALPHA_COLOR { %d,%d,%d }\n", D3DCOLGetR(_alpha), D3DCOLGetG(_alpha), D3DCOLGetB(_alpha));
+ Buffer->putTextIndent(Indent + 2, "ALPHA = %d\n", D3DCOLGetA(_alpha));
}
if (_mirrorX)
- Buffer->PutTextIndent(Indent + 2, "MIRROR_X=%s\n", _mirrorX ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "MIRROR_X=%s\n", _mirrorX ? "TRUE" : "FALSE");
if (_mirrorY)
- Buffer->PutTextIndent(Indent + 2, "MIRROR_Y=%s\n", _mirrorY ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "MIRROR_Y=%s\n", _mirrorY ? "TRUE" : "FALSE");
if (_2DOnly)
- Buffer->PutTextIndent(Indent + 2, "2D_ONLY=%s\n", _2DOnly ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "2D_ONLY=%s\n", _2DOnly ? "TRUE" : "FALSE");
if (_3DOnly)
- Buffer->PutTextIndent(Indent + 2, "3D_ONLY=%s\n", _3DOnly ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "3D_ONLY=%s\n", _3DOnly ? "TRUE" : "FALSE");
if (_decoration)
- Buffer->PutTextIndent(Indent + 2, "DECORATION=%s\n", _decoration ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DECORATION=%s\n", _decoration ? "TRUE" : "FALSE");
if (_editorSelected)
- Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "EDITOR_SELECTED=%s\n", _editorSelected ? "TRUE" : "FALSE");
CBBase::saveAsText(Buffer, Indent + 2);
if (Complete)
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "}\n\n");
return S_OK;
}
diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp index 7e575879c1..707fda0984 100644 --- a/engines/wintermute/Base/scriptables/ScValue.cpp +++ b/engines/wintermute/Base/scriptables/ScValue.cpp @@ -805,10 +805,10 @@ HRESULT CScValue::persist(CBPersistMgr *persistMgr) { HRESULT CScValue::saveAsText(CBDynBuffer *Buffer, int Indent) {
_valIter = _valObject.begin();
while (_valIter != _valObject.end()) {
- Buffer->PutTextIndent(Indent, "PROPERTY {\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _valIter->_key.c_str());
- Buffer->PutTextIndent(Indent + 2, "VALUE=\"%s\"\n", _valIter->_value->GetString());
- Buffer->PutTextIndent(Indent, "}\n\n");
+ Buffer->putTextIndent(Indent, "PROPERTY {\n");
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _valIter->_key.c_str());
+ Buffer->putTextIndent(Indent + 2, "VALUE=\"%s\"\n", _valIter->_value->GetString());
+ Buffer->putTextIndent(Indent, "}\n\n");
_valIter++;
}
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp index a4653c2007..79218a62e5 100644 --- a/engines/wintermute/UI/UIButton.cpp +++ b/engines/wintermute/UI/UIButton.cpp @@ -441,100 +441,100 @@ HRESULT CUIButton::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUIButton::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "BUTTON\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "BUTTON\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_back && _back->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
if (_backHover && _backHover->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK_HOVER=\"%s\"\n", _backHover->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK_HOVER=\"%s\"\n", _backHover->_filename);
if (_backPress && _backPress->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK_PRESS=\"%s\"\n", _backPress->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK_PRESS=\"%s\"\n", _backPress->_filename);
if (_backDisable && _backDisable->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK_DISABLE=\"%s\"\n", _backDisable->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK_DISABLE=\"%s\"\n", _backDisable->_filename);
if (_backFocus && _backFocus->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK_FOCUS=\"%s\"\n", _backFocus->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK_FOCUS=\"%s\"\n", _backFocus->_filename);
if (_image && _image->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
if (_imageHover && _imageHover->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE_HOVER=\"%s\"\n", _imageHover->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE_HOVER=\"%s\"\n", _imageHover->_filename);
if (_imagePress && _imagePress->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE_PRESS=\"%s\"\n", _imagePress->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE_PRESS=\"%s\"\n", _imagePress->_filename);
if (_imageDisable && _imageDisable->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE_DISABLE=\"%s\"\n", _imageDisable->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE_DISABLE=\"%s\"\n", _imageDisable->_filename);
if (_imageFocus && _imageFocus->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE_FOCUS=\"%s\"\n", _imageFocus->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE_FOCUS=\"%s\"\n", _imageFocus->_filename);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_fontHover && _fontHover->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_HOVER=\"%s\"\n", _fontHover->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_HOVER=\"%s\"\n", _fontHover->_filename);
if (_fontPress && _fontPress->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_PRESS=\"%s\"\n", _fontPress->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_PRESS=\"%s\"\n", _fontPress->_filename);
if (_fontDisable && _fontDisable->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_DISABLE=\"%s\"\n", _fontDisable->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_DISABLE=\"%s\"\n", _fontDisable->_filename);
if (_fontFocus && _fontFocus->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_FOCUS=\"%s\"\n", _fontFocus->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_FOCUS=\"%s\"\n", _fontFocus->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_text)
- Buffer->PutTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
+ Buffer->putTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
switch (_align) {
case TAL_LEFT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
break;
case TAL_RIGHT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
break;
case TAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
warning("CUIButton::SaveAsText - unhandled enum");
break;
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width);
- Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "WIDTH=%d\n", _width);
+ Buffer->putTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
- Buffer->PutTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "FOCUSABLE=%s\n", _canFocus ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "CENTER_IMAGE=%s\n", _centerImage ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PRESSED=%s\n", _stayPressed ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PIXEL_PERFECT=%s\n", _pixelPerfect ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "FOCUSABLE=%s\n", _canFocus ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "CENTER_IMAGE=%s\n", _centerImage ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PRESSED=%s\n", _stayPressed ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PIXEL_PERFECT=%s\n", _pixelPerfect ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// scripts
for (int i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index 091de2c2c9..928d04016a 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/UIEdit.cpp @@ -303,58 +303,58 @@ HRESULT CUIEdit::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUIEdit::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "EDIT\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "EDIT\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_back && _back->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
if (_image && _image->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_fontSelected && _fontSelected->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_SELECTED=\"%s\"\n", _fontSelected->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_SELECTED=\"%s\"\n", _fontSelected->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_text)
- Buffer->PutTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
+ Buffer->putTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width);
- Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
- Buffer->PutTextIndent(Indent + 2, "MAX_LENGTH=%d\n", _maxLength);
- Buffer->PutTextIndent(Indent + 2, "CURSOR_BLINK_RATE=%d\n", _cursorBlinkRate);
- Buffer->PutTextIndent(Indent + 2, "FRAME_WIDTH=%d\n", _frameWidth);
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "WIDTH=%d\n", _width);
+ Buffer->putTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
+ Buffer->putTextIndent(Indent + 2, "MAX_LENGTH=%d\n", _maxLength);
+ Buffer->putTextIndent(Indent + 2, "CURSOR_BLINK_RATE=%d\n", _cursorBlinkRate);
+ Buffer->putTextIndent(Indent + 2, "FRAME_WIDTH=%d\n", _frameWidth);
- Buffer->PutTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
// scripts
for (int i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index ef9e0df393..5a30c32e5d 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/UIEntity.cpp @@ -175,35 +175,35 @@ HRESULT CUIEntity::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUIEntity::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "ENTITY_CONTAINER\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "ENTITY_CONTAINER\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
if (_entity && _entity->_filename)
- Buffer->PutTextIndent(Indent + 2, "ENTITY=\"%s\"\n", _entity->_filename);
+ Buffer->putTextIndent(Indent + 2, "ENTITY=\"%s\"\n", _entity->_filename);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// scripts
for (int i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp index 9b495efafd..260ade166c 100644 --- a/engines/wintermute/UI/UIText.cpp +++ b/engines/wintermute/UI/UIText.cpp @@ -294,38 +294,38 @@ HRESULT CUIText::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUIText::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "STATIC\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "STATIC\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_back && _back->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
if (_image && _image->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
if (_text)
- Buffer->PutTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
+ Buffer->putTextIndent(Indent + 2, "TEXT=\"%s\"\n", _text);
switch (_textAlign) {
case TAL_LEFT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "left");
break;
case TAL_RIGHT:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "right");
break;
case TAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
error("CUIText::SaveAsText - Unhandled enum");
@@ -334,42 +334,42 @@ HRESULT CUIText::saveAsText(CBDynBuffer *Buffer, int Indent) { switch (_verticalAlign) {
case VAL_TOP:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
break;
case VAL_BOTTOM:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "bottom");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "bottom");
break;
case VAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
break;
default:
error("UIText::SaveAsText - Unhandled enum value: NUM_VERTICAL_ALIGN");
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width);
- Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "WIDTH=%d\n", _width);
+ Buffer->putTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
- Buffer->PutTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// scripts
for (int i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp index c47f3f09de..aea658e254 100644 --- a/engines/wintermute/UI/UITiledImage.cpp +++ b/engines/wintermute/UI/UITiledImage.cpp @@ -308,11 +308,11 @@ HRESULT CUITiledImage::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUITiledImage::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "TILED_IMAGE\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "TILED_IMAGE\n");
+ Buffer->putTextIndent(Indent, "{\n");
if (_image && _image->_surfaceFilename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_surfaceFilename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_surfaceFilename);
int H1, H2, H3;
int V1, V2, V3;
@@ -326,13 +326,13 @@ HRESULT CUITiledImage::saveAsText(CBDynBuffer *Buffer, int Indent) { V3 = _downLeft.bottom - _downLeft.top;
- Buffer->PutTextIndent(Indent + 2, "VERTICAL_TILES { %d, %d, %d }\n", V1, V2, V3);
- Buffer->PutTextIndent(Indent + 2, "HORIZONTAL_TILES { %d, %d, %d }\n", H1, H2, H3);
+ Buffer->putTextIndent(Indent + 2, "VERTICAL_TILES { %d, %d, %d }\n", V1, V2, V3);
+ Buffer->putTextIndent(Indent + 2, "HORIZONTAL_TILES { %d, %d, %d }\n", H1, H2, H3);
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index e0750a84f2..5d7bade46e 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -568,94 +568,94 @@ HRESULT CUIWindow::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
HRESULT CUIWindow::saveAsText(CBDynBuffer *Buffer, int Indent) {
- Buffer->PutTextIndent(Indent, "WINDOW\n");
- Buffer->PutTextIndent(Indent, "{\n");
+ Buffer->putTextIndent(Indent, "WINDOW\n");
+ Buffer->putTextIndent(Indent, "{\n");
- Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
- Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
+ Buffer->putTextIndent(Indent + 2, "NAME=\"%s\"\n", _name);
+ Buffer->putTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption());
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_back && _back->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK=\"%s\"\n", _back->_filename);
if (_backInactive && _backInactive->_filename)
- Buffer->PutTextIndent(Indent + 2, "BACK_INACTIVE=\"%s\"\n", _backInactive->_filename);
+ Buffer->putTextIndent(Indent + 2, "BACK_INACTIVE=\"%s\"\n", _backInactive->_filename);
if (_image && _image->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE=\"%s\"\n", _image->_filename);
if (_imageInactive && _imageInactive->_filename)
- Buffer->PutTextIndent(Indent + 2, "IMAGE_INACTIVE=\"%s\"\n", _imageInactive->_filename);
+ Buffer->putTextIndent(Indent + 2, "IMAGE_INACTIVE=\"%s\"\n", _imageInactive->_filename);
if (_font && _font->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT=\"%s\"\n", _font->_filename);
if (_fontInactive && _fontInactive->_filename)
- Buffer->PutTextIndent(Indent + 2, "FONT_INACTIVE=\"%s\"\n", _fontInactive->_filename);
+ Buffer->putTextIndent(Indent + 2, "FONT_INACTIVE=\"%s\"\n", _fontInactive->_filename);
if (_cursor && _cursor->_filename)
- Buffer->PutTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
+ Buffer->putTextIndent(Indent + 2, "CURSOR=\"%s\"\n", _cursor->_filename);
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_text)
- Buffer->PutTextIndent(Indent + 2, "TITLE=\"%s\"\n", _text);
+ Buffer->putTextIndent(Indent + 2, "TITLE=\"%s\"\n", _text);
switch (_titleAlign) {
case TAL_LEFT:
- Buffer->PutTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "left");
+ Buffer->putTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "left");
break;
case TAL_RIGHT:
- Buffer->PutTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "right");
+ Buffer->putTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "right");
break;
case TAL_CENTER:
- Buffer->PutTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "center");
+ Buffer->putTextIndent(Indent + 2, "TITLE_ALIGN=\"%s\"\n", "center");
break;
default:
error("UIWindow::SaveAsText - Unhandled enum-value NUM_TEXT_ALIGN");
}
if (!CBPlatform::IsRectEmpty(&_titleRect)) {
- Buffer->PutTextIndent(Indent + 2, "TITLE_RECT { %d, %d, %d, %d }\n", _titleRect.left, _titleRect.top, _titleRect.right, _titleRect.bottom);
+ Buffer->putTextIndent(Indent + 2, "TITLE_RECT { %d, %d, %d, %d }\n", _titleRect.left, _titleRect.top, _titleRect.right, _titleRect.bottom);
}
if (!CBPlatform::IsRectEmpty(&_dragRect)) {
- Buffer->PutTextIndent(Indent + 2, "DRAG_RECT { %d, %d, %d, %d }\n", _dragRect.left, _dragRect.top, _dragRect.right, _dragRect.bottom);
+ Buffer->putTextIndent(Indent + 2, "DRAG_RECT { %d, %d, %d, %d }\n", _dragRect.left, _dragRect.top, _dragRect.right, _dragRect.bottom);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
- Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX);
- Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY);
- Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width);
- Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
+ Buffer->putTextIndent(Indent + 2, "X=%d\n", _posX);
+ Buffer->putTextIndent(Indent + 2, "Y=%d\n", _posY);
+ Buffer->putTextIndent(Indent + 2, "WIDTH=%d\n", _width);
+ Buffer->putTextIndent(Indent + 2, "HEIGHT=%d\n", _height);
- Buffer->PutTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "DISABLED=%s\n", _disable ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "VISIBLE=%s\n", _visible ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PARENT_NOTIFY=%s\n", _parentNotify ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "TRANSPARENT=%s\n", _transparent ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "PAUSE_MUSIC=%s\n", _pauseMusic ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "MENU=%s\n", _isMenu ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "IN_GAME=%s\n", _inGame ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "CLIP_CONTENTS=%s\n", _clipContents ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "TRANSPARENT=%s\n", _transparent ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "PAUSE_MUSIC=%s\n", _pauseMusic ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "MENU=%s\n", _isMenu ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "IN_GAME=%s\n", _inGame ? "TRUE" : "FALSE");
+ Buffer->putTextIndent(Indent + 2, "CLIP_CONTENTS=%s\n", _clipContents ? "TRUE" : "FALSE");
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
if (_fadeBackground) {
- Buffer->PutTextIndent(Indent + 2, "FADE_COLOR { %d, %d, %d }\n", D3DCOLGetR(_fadeColor), D3DCOLGetG(_fadeColor), D3DCOLGetB(_fadeColor));
- Buffer->PutTextIndent(Indent + 2, "FADE_ALPHA=%d\n", D3DCOLGetA(_fadeColor));
+ Buffer->putTextIndent(Indent + 2, "FADE_COLOR { %d, %d, %d }\n", D3DCOLGetR(_fadeColor), D3DCOLGetG(_fadeColor), D3DCOLGetB(_fadeColor));
+ Buffer->putTextIndent(Indent + 2, "FADE_ALPHA=%d\n", D3DCOLGetA(_fadeColor));
}
- Buffer->PutTextIndent(Indent + 2, "ALPHA_COLOR { %d, %d, %d }\n", D3DCOLGetR(_alphaColor), D3DCOLGetG(_alphaColor), D3DCOLGetB(_alphaColor));
- Buffer->PutTextIndent(Indent + 2, "ALPHA=%d\n", D3DCOLGetA(_alphaColor));
+ Buffer->putTextIndent(Indent + 2, "ALPHA_COLOR { %d, %d, %d }\n", D3DCOLGetR(_alphaColor), D3DCOLGetG(_alphaColor), D3DCOLGetB(_alphaColor));
+ Buffer->putTextIndent(Indent + 2, "ALPHA=%d\n", D3DCOLGetA(_alphaColor));
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// scripts
for (int i = 0; i < _scripts.GetSize(); i++) {
- Buffer->PutTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
+ Buffer->putTextIndent(Indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- Buffer->PutTextIndent(Indent + 2, "\n");
+ Buffer->putTextIndent(Indent + 2, "\n");
// editor properties
CBBase::saveAsText(Buffer, Indent + 2);
@@ -665,7 +665,7 @@ HRESULT CUIWindow::saveAsText(CBDynBuffer *Buffer, int Indent) { _widgets[i]->saveAsText(Buffer, Indent + 2);
- Buffer->PutTextIndent(Indent, "}\n");
+ Buffer->putTextIndent(Indent, "}\n");
return S_OK;
}
|