WINTERMUTE: Rename FuncName->funcName in CScValue

6 files changed, 114 insertions, 114 deletions

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 538f8eb886..69809874bf 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -675,11 +675,11 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		if (_fontDisable) Game->_fontStorage->RemoveFont(_fontDisable);

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			_fontDisable = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontDisable = Game->_fontStorage->AddFont(Val->GetString());

+			_fontDisable = Game->_fontStorage->AddFont(Val->getString());

 			stack->pushBool(_fontDisable != NULL);

 		}

 		return S_OK;

@@ -693,11 +693,11 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			_fontHover = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontHover = Game->_fontStorage->AddFont(Val->GetString());

+			_fontHover = Game->_fontStorage->AddFont(Val->getString());

 			stack->pushBool(_fontHover != NULL);

 		}

 		return S_OK;

@@ -711,11 +711,11 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		if (_fontPress) Game->_fontStorage->RemoveFont(_fontPress);

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			_fontPress = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontPress = Game->_fontStorage->AddFont(Val->GetString());

+			_fontPress = Game->_fontStorage->AddFont(Val->getString());

 			stack->pushBool(_fontPress != NULL);

 		}

 		return S_OK;

@@ -729,11 +729,11 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		if (_fontFocus) Game->_fontStorage->RemoveFont(_fontFocus);

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			_fontFocus = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontFocus = Game->_fontStorage->AddFont(Val->GetString());

+			_fontFocus = Game->_fontStorage->AddFont(Val->getString());

 			stack->pushBool(_fontFocus != NULL);

 		}

 		return S_OK;

@@ -747,7 +747,7 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		delete _imageDisable;

 		_imageDisable = new CBSprite(Game);

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 		if (!_imageDisable || FAILED(_imageDisable->loadFile(Filename))) {

 			delete _imageDisable;

 			_imageDisable = NULL;

@@ -788,7 +788,7 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		delete _imageHover;

 		_imageHover = new CBSprite(Game);

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 		if (!_imageHover || FAILED(_imageHover->loadFile(Filename))) {

 			delete _imageHover;

 			_imageHover = NULL;

@@ -828,7 +828,7 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		delete _imagePress;

 		_imagePress = new CBSprite(Game);

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 		if (!_imagePress || FAILED(_imagePress->loadFile(Filename))) {

 			delete _imagePress;

 			_imagePress = NULL;

@@ -868,7 +868,7 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		delete _imageFocus;

 		_imageFocus = new CBSprite(Game);

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 		if (!_imageFocus || FAILED(_imageFocus->loadFile(Filename))) {

 			delete _imageFocus;

 			_imageFocus = NULL;

@@ -922,13 +922,13 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIButton::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("button");

+		_scValue->setString("button");

 		return _scValue;

 	}

 

@@ -936,7 +936,7 @@ CScValue *CUIButton::scGetProperty(const char *name) {
 	// TextAlign

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "TextAlign") == 0) {

-		_scValue->SetInt(_align);

+		_scValue->setInt(_align);

 		return _scValue;

 	}

 

@@ -944,21 +944,21 @@ CScValue *CUIButton::scGetProperty(const char *name) {
 	// Focusable

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Focusable") == 0) {

-		_scValue->SetBool(_canFocus);

+		_scValue->setBool(_canFocus);

 		return _scValue;

 	}

 	//////////////////////////////////////////////////////////////////////////

 	// Pressed

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Pressed") == 0) {

-		_scValue->SetBool(_stayPressed);

+		_scValue->setBool(_stayPressed);

 		return _scValue;

 	}

 	//////////////////////////////////////////////////////////////////////////

 	// PixelPerfect

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "PixelPerfect") == 0) {

-		_scValue->SetBool(_pixelPerfect);

+		_scValue->setBool(_pixelPerfect);

 		return _scValue;

 	}

 

@@ -972,7 +972,7 @@ HRESULT CUIButton::scSetProperty(const char *name, CScValue *value) {
 	// TextAlign

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "TextAlign") == 0) {

-		int i = value->GetInt();

+		int i = value->getInt();

 		if (i < 0 || i >= NUM_TEXT_ALIGN) i = 0;

 		_align = (TTextAlign)i;

 		return S_OK;

@@ -982,21 +982,21 @@ HRESULT CUIButton::scSetProperty(const char *name, CScValue *value) {
 	// Focusable

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Focusable") == 0) {

-		_canFocus = value->GetBool();

+		_canFocus = value->getBool();

 		return S_OK;

 	}

 	//////////////////////////////////////////////////////////////////////////

 	// Pressed

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Pressed") == 0) {

-		_stayPressed = value->GetBool();

+		_stayPressed = value->getBool();

 		return S_OK;

 	}

 	//////////////////////////////////////////////////////////////////////////

 	// PixelPerfect

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "PixelPerfect") == 0) {

-		_pixelPerfect = value->GetBool();

+		_pixelPerfect = value->getBool();

 		return S_OK;

 	}

 

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index eb59724089..c17bd405ab 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -369,7 +369,7 @@ HRESULT CUIEdit::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
 		stack->correctParams(1);

 

 		if (_fontSelected) Game->_fontStorage->RemoveFont(_fontSelected);

-		_fontSelected = Game->_fontStorage->AddFont(stack->pop()->GetString());

+		_fontSelected = Game->_fontStorage->AddFont(stack->pop()->getString());

 		stack->pushBool(_fontSelected != NULL);

 

 		return S_OK;

@@ -381,13 +381,13 @@ HRESULT CUIEdit::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIEdit::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("editor");

+		_scValue->setString("editor");

 		return _scValue;

 	}

 

@@ -395,7 +395,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// SelStart

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SelStart") == 0) {

-		_scValue->SetInt(_selStart);

+		_scValue->setInt(_selStart);

 		return _scValue;

 	}

 

@@ -403,7 +403,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// SelEnd

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SelEnd") == 0) {

-		_scValue->SetInt(_selEnd);

+		_scValue->setInt(_selEnd);

 		return _scValue;

 	}

 

@@ -411,7 +411,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// CursorBlinkRate

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "CursorBlinkRate") == 0) {

-		_scValue->SetInt(_cursorBlinkRate);

+		_scValue->setInt(_cursorBlinkRate);

 		return _scValue;

 	}

 

@@ -419,7 +419,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// CursorChar

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "CursorChar") == 0) {

-		_scValue->SetString(_cursorChar);

+		_scValue->setString(_cursorChar);

 		return _scValue;

 	}

 

@@ -427,7 +427,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// FrameWidth

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "FrameWidth") == 0) {

-		_scValue->SetInt(_frameWidth);

+		_scValue->setInt(_frameWidth);

 		return _scValue;

 	}

 

@@ -435,7 +435,7 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	// MaxLength

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "MaxLength") == 0) {

-		_scValue->SetInt(_maxLength);

+		_scValue->setInt(_maxLength);

 		return _scValue;

 	}

 

@@ -445,9 +445,9 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 	else if (strcmp(name, "Text") == 0) {

 		if (Game->_textEncoding == TEXT_UTF8) {

 			WideString wstr = StringUtil::AnsiToWide(_text);

-			_scValue->SetString(StringUtil::WideToUtf8(wstr).c_str());

+			_scValue->setString(StringUtil::WideToUtf8(wstr).c_str());

 		} else {

-			_scValue->SetString(_text);

+			_scValue->setString(_text);

 		}

 		return _scValue;

 	}

@@ -462,7 +462,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// SelStart

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "SelStart") == 0) {

-		_selStart = value->GetInt();

+		_selStart = value->getInt();

 		_selStart = MAX(_selStart, 0);

 		_selStart = MIN((size_t)_selStart, strlen(_text));

 		return S_OK;

@@ -472,7 +472,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// SelEnd

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SelEnd") == 0) {

-		_selEnd = value->GetInt();

+		_selEnd = value->getInt();

 		_selEnd = MAX(_selEnd, 0);

 		_selEnd = MIN((size_t)_selEnd, strlen(_text));

 		return S_OK;

@@ -482,7 +482,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// CursorBlinkRate

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "CursorBlinkRate") == 0) {

-		_cursorBlinkRate = value->GetInt();

+		_cursorBlinkRate = value->getInt();

 		return S_OK;

 	}

 

@@ -490,7 +490,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// CursorChar

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "CursorChar") == 0) {

-		setCursorChar(value->GetString());

+		setCursorChar(value->getString());

 		return S_OK;

 	}

 

@@ -498,7 +498,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// FrameWidth

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "FrameWidth") == 0) {

-		_frameWidth = value->GetInt();

+		_frameWidth = value->getInt();

 		return S_OK;

 	}

 

@@ -506,7 +506,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	// MaxLength

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "MaxLength") == 0) {

-		_maxLength = value->GetInt();

+		_maxLength = value->getInt();

 		return S_OK;

 	}

 

@@ -515,10 +515,10 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Text") == 0) {

 		if (Game->_textEncoding == TEXT_UTF8) {

-			WideString wstr = StringUtil::Utf8ToWide(value->GetString());

+			WideString wstr = StringUtil::Utf8ToWide(value->getString());

 			setText(StringUtil::WideToAnsi(wstr).c_str());

 		} else {

-			setText(value->GetString());

+			setText(value->getString());

 		}

 		return S_OK;

 	}

diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index 305f9642a5..a2b065dd3d 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -270,7 +270,7 @@ HRESULT CUIEntity::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 	else if (strcmp(name, "SetEntity") == 0) {

 		stack->correctParams(1);

 

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 

 		if (SUCCEEDED(setEntity(Filename)))

 			stack->pushBool(true);

@@ -286,13 +286,13 @@ HRESULT CUIEntity::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIEntity::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("entity container");

+		_scValue->setString("entity container");

 		return _scValue;

 	}

 

@@ -300,8 +300,8 @@ CScValue *CUIEntity::scGetProperty(const char *name) {
 	// Freezable

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Freezable") == 0) {

-		if (_entity) _scValue->SetBool(_entity->_freezable);

-		else _scValue->SetBool(false);

+		if (_entity) _scValue->setBool(_entity->_freezable);

+		else _scValue->setBool(false);

 		return _scValue;

 	}

 

@@ -315,7 +315,7 @@ HRESULT CUIEntity::scSetProperty(const char *name, CScValue *value) {
 	// Freezable

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Freezable") == 0) {

-		if (_entity) _entity->makeFreezable(value->GetBool());

+		if (_entity) _entity->makeFreezable(value->getBool());

 		return S_OK;

 	} else return CUIObject::scSetProperty(name, value);

 }

diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index a713649604..0a387c48c8 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -146,11 +146,11 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		if (_font) Game->_fontStorage->RemoveFont(_font);

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			_font = NULL;

 			stack->pushBool(true);

 		} else {

-			_font = Game->_fontStorage->AddFont(Val->GetString());

+			_font = Game->_fontStorage->AddFont(Val->getString());

 			stack->pushBool(_font != NULL);

 		}

 		return S_OK;

@@ -163,17 +163,17 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		/* const char *Filename = */ Val->GetString();

+		/* const char *Filename = */ Val->getString();

 

 		delete _image;

 		_image = NULL;

-		if (Val->IsNULL()) {

+		if (Val->isNULL()) {

 			stack->pushBool(true);

 			return S_OK;

 		}

 

 		_image = new CBSprite(Game);

-		if (!_image || FAILED(_image->loadFile(Val->GetString()))) {

+		if (!_image || FAILED(_image->loadFile(Val->getString()))) {

 			delete _image;

 			_image = NULL;

 			stack->pushBool(false);

@@ -227,8 +227,8 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 			bool found = false;

 			CScValue *val = stack->pop();

 			// find directly

-			if (val->IsNative()) {

-				CUIObject *widget = (CUIObject *)val->GetNative();

+			if (val->isNative()) {

+				CUIObject *widget = (CUIObject *)val->getNative();

 				for (i = 0; i < win->_widgets.GetSize(); i++) {

 					if (win->_widgets[i] == widget) {

 						found = true;

@@ -238,7 +238,7 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 			}

 			// find by name

 			else {

-				const char *name = val->GetString();

+				const char *name = val->getString();

 				for (i = 0; i < win->_widgets.GetSize(); i++) {

 					if (scumm_stricmp(win->_widgets[i]->_name, name) == 0) {

 						found = true;

@@ -318,13 +318,13 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIObject::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("ui_object");

+		_scValue->setString("ui_object");

 		return _scValue;

 	}

 

@@ -332,7 +332,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Name

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Name") == 0) {

-		_scValue->SetString(_name);

+		_scValue->setString(_name);

 		return _scValue;

 	}

 

@@ -340,7 +340,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Parent (RO)

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Parent") == 0) {

-		_scValue->SetNative(_parent, true);

+		_scValue->setNative(_parent, true);

 		return _scValue;

 	}

 

@@ -348,7 +348,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// ParentNotify

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "ParentNotify") == 0) {

-		_scValue->SetBool(_parentNotify);

+		_scValue->setBool(_parentNotify);

 		return _scValue;

 	}

 

@@ -356,7 +356,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Width

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Width") == 0) {

-		_scValue->SetInt(_width);

+		_scValue->setInt(_width);

 		return _scValue;

 	}

 

@@ -364,7 +364,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Height

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Height") == 0) {

-		_scValue->SetInt(_height);

+		_scValue->setInt(_height);

 		return _scValue;

 	}

 

@@ -372,7 +372,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Visible

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Visible") == 0) {

-		_scValue->SetBool(_visible);

+		_scValue->setBool(_visible);

 		return _scValue;

 	}

 

@@ -380,7 +380,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Disabled

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Disabled") == 0) {

-		_scValue->SetBool(_disable);

+		_scValue->setBool(_disable);

 		return _scValue;

 	}

 

@@ -388,7 +388,7 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// Text

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Text") == 0) {

-		_scValue->SetString(_text);

+		_scValue->setString(_text);

 		return _scValue;

 	}

 

@@ -396,15 +396,15 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 	// NextSibling (RO) / PrevSibling (RO)

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "NextSibling") == 0 || strcmp(name, "PrevSibling") == 0) {

-		_scValue->SetNULL();

+		_scValue->setNULL();

 		if (_parent && _parent->_type == UI_WINDOW) {

 			CUIWindow *win = (CUIWindow *)_parent;

 			for (int i = 0; i < win->_widgets.GetSize(); i++) {

 				if (win->_widgets[i] == this) {

 					if (strcmp(name, "NextSibling") == 0) {

-						if (i < win->_widgets.GetSize() - 1) _scValue->SetNative(win->_widgets[i + 1], true);

+						if (i < win->_widgets.GetSize() - 1) _scValue->setNative(win->_widgets[i + 1], true);

 					} else {

-						if (i > 0) _scValue->SetNative(win->_widgets[i - 1], true);

+						if (i > 0) _scValue->setNative(win->_widgets[i - 1], true);

 					}

 					break;

 				}

@@ -423,7 +423,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Name

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Name") == 0) {

-		setName(value->GetString());

+		setName(value->getString());

 		return S_OK;

 	}

 

@@ -431,7 +431,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// ParentNotify

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "ParentNotify") == 0) {

-		_parentNotify = value->GetBool();

+		_parentNotify = value->getBool();

 		return S_OK;

 	}

 

@@ -439,7 +439,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Width

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Width") == 0) {

-		_width = value->GetInt();

+		_width = value->getInt();

 		return S_OK;

 	}

 

@@ -447,7 +447,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Height

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Height") == 0) {

-		_height = value->GetInt();

+		_height = value->getInt();

 		return S_OK;

 	}

 

@@ -455,7 +455,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Visible

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Visible") == 0) {

-		_visible = value->GetBool();

+		_visible = value->getBool();

 		return S_OK;

 	}

 

@@ -463,7 +463,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Disabled

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Disabled") == 0) {

-		_disable = value->GetBool();

+		_disable = value->getBool();

 		return S_OK;

 	}

 

@@ -471,7 +471,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
 	// Text

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Text") == 0) {

-		setText(value->GetString());

+		setText(value->getString());

 		return S_OK;

 	}

 

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 414a237556..0d7966188e 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -403,13 +403,13 @@ HRESULT CUIText::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIText::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("static");

+		_scValue->setString("static");

 		return _scValue;

 	}

 

@@ -417,7 +417,7 @@ CScValue *CUIText::scGetProperty(const char *name) {
 	// TextAlign

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "TextAlign") == 0) {

-		_scValue->SetInt(_textAlign);

+		_scValue->setInt(_textAlign);

 		return _scValue;

 	}

 

@@ -425,7 +425,7 @@ CScValue *CUIText::scGetProperty(const char *name) {
 	// VerticalAlign

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "VerticalAlign") == 0) {

-		_scValue->SetInt(_verticalAlign);

+		_scValue->setInt(_verticalAlign);

 		return _scValue;

 	}

 

@@ -439,7 +439,7 @@ HRESULT CUIText::scSetProperty(const char *name, CScValue *value) {
 	// TextAlign

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "TextAlign") == 0) {

-		int i = value->GetInt();

+		int i = value->getInt();

 		if (i < 0 || i >= NUM_TEXT_ALIGN) i = 0;

 		_textAlign = (TTextAlign)i;

 		return S_OK;

@@ -449,7 +449,7 @@ HRESULT CUIText::scSetProperty(const char *name, CScValue *value) {
 	// VerticalAlign

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "VerticalAlign") == 0) {

-		int i = value->GetInt();

+		int i = value->getInt();

 		if (i < 0 || i >= NUM_VERTICAL_ALIGN) i = 0;

 		_verticalAlign = (TVerticalAlign)i;

 		return S_OK;

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index 24e2255d2b..ffa3df97c4 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -697,13 +697,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 	if (strcmp(name, "GetWidget") == 0 || strcmp(name, "GetControl") == 0) {

 		stack->correctParams(1);

 		CScValue *val = stack->pop();

-		if (val->GetType() == VAL_INT) {

-			int widget = val->GetInt();

+		if (val->getType() == VAL_INT) {

+			int widget = val->getInt();

 			if (widget < 0 || widget >= _widgets.GetSize()) stack->pushNULL();

 			else stack->pushNative(_widgets[widget], true);

 		} else {

 			for (int i = 0; i < _widgets.GetSize(); i++) {

-				if (scumm_stricmp(_widgets[i]->_name, val->GetString()) == 0) {

+				if (scumm_stricmp(_widgets[i]->_name, val->getString()) == 0) {

 					stack->pushNative(_widgets[i], true);

 					return S_OK;

 				}

@@ -721,7 +721,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 

 		if (_fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);

-		_fontInactive = Game->_fontStorage->AddFont(stack->pop()->GetString());

+		_fontInactive = Game->_fontStorage->AddFont(stack->pop()->getString());

 		stack->pushBool(_fontInactive != NULL);

 

 		return S_OK;

@@ -735,7 +735,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		delete _imageInactive;

 		_imageInactive = new CBSprite(Game);

-		const char *Filename = stack->pop()->GetString();

+		const char *Filename = stack->pop()->getString();

 		if (!_imageInactive || FAILED(_imageInactive->loadFile(Filename))) {

 			delete _imageInactive;

 			_imageInactive = NULL;

@@ -818,8 +818,8 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 		CScValue *Val = stack->pop();

 		cleanup();

-		if (!Val->IsNULL()) {

-			stack->pushBool(SUCCEEDED(loadFile(Val->GetString())));

+		if (!Val->isNULL()) {

+			stack->pushBool(SUCCEEDED(loadFile(Val->getString())));

 		} else stack->pushBool(true);

 

 		return S_OK;

@@ -833,7 +833,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		CUIButton *Btn = new CUIButton(Game);

-		if (!Val->IsNULL()) Btn->setName(Val->GetString());

+		if (!Val->isNULL()) Btn->setName(Val->getString());

 		stack->pushNative(Btn, true);

 

 		Btn->_parent = this;

@@ -850,7 +850,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		CUIText *Sta = new CUIText(Game);

-		if (!Val->IsNULL()) Sta->setName(Val->GetString());

+		if (!Val->isNULL()) Sta->setName(Val->getString());

 		stack->pushNative(Sta, true);

 

 		Sta->_parent = this;

@@ -867,7 +867,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		CUIEdit *Edi = new CUIEdit(Game);

-		if (!Val->IsNULL()) Edi->setName(Val->GetString());

+		if (!Val->isNULL()) Edi->setName(Val->getString());

 		stack->pushNative(Edi, true);

 

 		Edi->_parent = this;

@@ -884,7 +884,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		CScValue *Val = stack->pop();

 

 		CUIWindow *Win = new CUIWindow(Game);

-		if (!Val->IsNULL()) Win->setName(Val->GetString());

+		if (!Val->isNULL()) Win->setName(Val->getString());

 		stack->pushNative(Win, true);

 

 		Win->_parent = this;

@@ -899,13 +899,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 	else if (strcmp(name, "DeleteControl") == 0 || strcmp(name, "DeleteButton") == 0 || strcmp(name, "DeleteStatic") == 0 || strcmp(name, "DeleteEditor") == 0 || strcmp(name, "DeleteWindow") == 0) {

 		stack->correctParams(1);

 		CScValue *val = stack->pop();

-		CUIObject *obj = (CUIObject *)val->GetNative();

+		CUIObject *obj = (CUIObject *)val->getNative();

 

 		for (int i = 0; i < _widgets.GetSize(); i++) {

 			if (_widgets[i] == obj) {

 				delete _widgets[i];

 				_widgets.RemoveAt(i);

-				if (val->GetType() == VAL_VARIABLE_REF) val->SetNULL();

+				if (val->getType() == VAL_VARIABLE_REF) val->setNULL();

 			}

 		}

 		stack->pushNULL();

@@ -918,13 +918,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 

 //////////////////////////////////////////////////////////////////////////

 CScValue *CUIWindow::scGetProperty(const char *name) {

-	_scValue->SetNULL();

+	_scValue->setNULL();

 

 	//////////////////////////////////////////////////////////////////////////

 	// Type

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Type") == 0) {

-		_scValue->SetString("window");

+		_scValue->setString("window");

 		return _scValue;

 	}

 

@@ -932,7 +932,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// NumWidgets / NumControls (RO)

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "NumWidgets") == 0 || strcmp(name, "NumControls") == 0) {

-		_scValue->SetInt(_widgets.GetSize());

+		_scValue->setInt(_widgets.GetSize());

 		return _scValue;

 	}

 

@@ -940,7 +940,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// Exclusive

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Exclusive") == 0) {

-		_scValue->SetBool(_mode == WINDOW_EXCLUSIVE);

+		_scValue->setBool(_mode == WINDOW_EXCLUSIVE);

 		return _scValue;

 	}

 

@@ -948,7 +948,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// SystemExclusive

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SystemExclusive") == 0) {

-		_scValue->SetBool(_mode == WINDOW_SYSTEM_EXCLUSIVE);

+		_scValue->setBool(_mode == WINDOW_SYSTEM_EXCLUSIVE);

 		return _scValue;

 	}

 

@@ -956,7 +956,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// Menu

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Menu") == 0) {

-		_scValue->SetBool(_isMenu);

+		_scValue->setBool(_isMenu);

 		return _scValue;

 	}

 

@@ -964,7 +964,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// InGame

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "InGame") == 0) {

-		_scValue->SetBool(_inGame);

+		_scValue->setBool(_inGame);

 		return _scValue;

 	}

 

@@ -972,7 +972,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// PauseMusic

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "PauseMusic") == 0) {

-		_scValue->SetBool(_pauseMusic);

+		_scValue->setBool(_pauseMusic);

 		return _scValue;

 	}

 

@@ -980,7 +980,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// ClipContents

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "ClipContents") == 0) {

-		_scValue->SetBool(_clipContents);

+		_scValue->setBool(_clipContents);

 		return _scValue;

 	}

 

@@ -988,7 +988,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// Transparent

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Transparent") == 0) {

-		_scValue->SetBool(_transparent);

+		_scValue->setBool(_transparent);

 		return _scValue;

 	}

 

@@ -996,7 +996,7 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 	// FadeColor

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "FadeColor") == 0) {

-		_scValue->SetInt((int)_fadeColor);

+		_scValue->setInt((int)_fadeColor);

 		return _scValue;

 	}

 

@@ -1010,7 +1010,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// Name

 	//////////////////////////////////////////////////////////////////////////

 	if (strcmp(name, "Name") == 0) {

-		setName(value->GetString());

+		setName(value->getString());

 		return S_OK;

 	}

 

@@ -1018,7 +1018,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// Menu

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Menu") == 0) {

-		_isMenu = value->GetBool();

+		_isMenu = value->getBool();

 		return S_OK;

 	}

 

@@ -1026,7 +1026,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// InGame

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "InGame") == 0) {

-		_inGame = value->GetBool();

+		_inGame = value->getBool();

 		return S_OK;

 	}

 

@@ -1034,7 +1034,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// PauseMusic

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "PauseMusic") == 0) {

-		_pauseMusic = value->GetBool();

+		_pauseMusic = value->getBool();

 		return S_OK;

 	}

 

@@ -1042,7 +1042,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// ClipContents

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "ClipContents") == 0) {

-		_clipContents = value->GetBool();

+		_clipContents = value->getBool();

 		return S_OK;

 	}

 

@@ -1050,7 +1050,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// Transparent

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Transparent") == 0) {

-		_transparent = value->GetBool();

+		_transparent = value->getBool();

 		return S_OK;

 	}

 

@@ -1058,7 +1058,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// FadeColor

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "FadeColor") == 0) {

-		_fadeColor = (uint32)value->GetInt();

+		_fadeColor = (uint32)value->getInt();

 		_fadeBackground = (_fadeColor != 0);

 		return S_OK;

 	}

@@ -1067,7 +1067,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// Exclusive

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Exclusive") == 0) {

-		if (value->GetBool())

+		if (value->getBool())

 			goExclusive();

 		else {

 			close();

@@ -1080,7 +1080,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
 	// SystemExclusive

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SystemExclusive") == 0) {

-		if (value->GetBool())

+		if (value->getBool())

 			goSystemExclusive();

 		else {

 			close();