WINTERMUTE: Rename FuncName->funcName in BDynBuffer.

8 files changed, 102 insertions, 102 deletions

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++;

 	}