WINTERMUTE: Mass rename varName->VarName

12 files changed, 325 insertions, 325 deletions

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 58440d0095..ea20e29490 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -666,21 +666,21 @@ void CUIButton::press() {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// SetDisabledFont

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

-	if (strcmp(Name, "SetDisabledFont") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	if (strcmp(name, "SetDisabledFont") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 		if (Val->IsNULL()) {

 			_fontDisable = NULL;

-			Stack->PushBool(true);

+			stack->PushBool(true);

 		} else {

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

-			Stack->PushBool(_fontDisable != NULL);

+			stack->PushBool(_fontDisable != NULL);

 		}

 		return S_OK;

 	}

@@ -688,17 +688,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetHoverFont

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

-	else if (strcmp(Name, "SetHoverFont") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "SetHoverFont") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 		if (Val->IsNULL()) {

 			_fontHover = NULL;

-			Stack->PushBool(true);

+			stack->PushBool(true);

 		} else {

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

-			Stack->PushBool(_fontHover != NULL);

+			stack->PushBool(_fontHover != NULL);

 		}

 		return S_OK;

 	}

@@ -706,17 +706,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetPressedFont

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

-	else if (strcmp(Name, "SetPressedFont") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "SetPressedFont") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 		if (Val->IsNULL()) {

 			_fontPress = NULL;

-			Stack->PushBool(true);

+			stack->PushBool(true);

 		} else {

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

-			Stack->PushBool(_fontPress != NULL);

+			stack->PushBool(_fontPress != NULL);

 		}

 		return S_OK;

 	}

@@ -724,17 +724,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetFocusedFont

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

-	else if (strcmp(Name, "SetFocusedFont") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "SetFocusedFont") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 		if (Val->IsNULL()) {

 			_fontFocus = NULL;

-			Stack->PushBool(true);

+			stack->PushBool(true);

 		} else {

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

-			Stack->PushBool(_fontFocus != NULL);

+			stack->PushBool(_fontFocus != NULL);

 		}

 		return S_OK;

 	}

@@ -742,17 +742,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetDisabledImage

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

-	else if (strcmp(Name, "SetDisabledImage") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetDisabledImage") == 0) {

+		stack->CorrectParams(1);

 

 		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;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -760,10 +760,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetDisabledImage

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

-	else if (strcmp(Name, "GetDisabledImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageDisable || !_imageDisable->_filename) Stack->PushNULL();

-		else Stack->PushString(_imageDisable->_filename);

+	else if (strcmp(name, "GetDisabledImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageDisable || !_imageDisable->_filename) stack->PushNULL();

+		else stack->PushString(_imageDisable->_filename);

 

 		return S_OK;

 	}

@@ -771,10 +771,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetDisabledImageObject

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

-	else if (strcmp(Name, "GetDisabledImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageDisable) Stack->PushNULL();

-		else Stack->PushNative(_imageDisable, true);

+	else if (strcmp(name, "GetDisabledImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageDisable) stack->PushNULL();

+		else stack->PushNative(_imageDisable, true);

 

 		return S_OK;

 	}

@@ -783,17 +783,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetHoverImage

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

-	else if (strcmp(Name, "SetHoverImage") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetHoverImage") == 0) {

+		stack->CorrectParams(1);

 

 		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;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -801,10 +801,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetHoverImage

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

-	else if (strcmp(Name, "GetHoverImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageHover || !_imageHover->_filename) Stack->PushNULL();

-		else Stack->PushString(_imageHover->_filename);

+	else if (strcmp(name, "GetHoverImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageHover || !_imageHover->_filename) stack->PushNULL();

+		else stack->PushString(_imageHover->_filename);

 

 		return S_OK;

 	}

@@ -812,10 +812,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetHoverImageObject

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

-	else if (strcmp(Name, "GetHoverImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageHover) Stack->PushNULL();

-		else Stack->PushNative(_imageHover, true);

+	else if (strcmp(name, "GetHoverImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageHover) stack->PushNULL();

+		else stack->PushNative(_imageHover, true);

 

 		return S_OK;

 	}

@@ -823,17 +823,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetPressedImage

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

-	else if (strcmp(Name, "SetPressedImage") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetPressedImage") == 0) {

+		stack->CorrectParams(1);

 

 		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;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -841,10 +841,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetPressedImage

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

-	else if (strcmp(Name, "GetPressedImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imagePress || !_imagePress->_filename) Stack->PushNULL();

-		else Stack->PushString(_imagePress->_filename);

+	else if (strcmp(name, "GetPressedImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_imagePress || !_imagePress->_filename) stack->PushNULL();

+		else stack->PushString(_imagePress->_filename);

 

 		return S_OK;

 	}

@@ -852,10 +852,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetPressedImageObject

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

-	else if (strcmp(Name, "GetPressedImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imagePress) Stack->PushNULL();

-		else Stack->PushNative(_imagePress, true);

+	else if (strcmp(name, "GetPressedImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_imagePress) stack->PushNULL();

+		else stack->PushNative(_imagePress, true);

 

 		return S_OK;

 	}

@@ -863,17 +863,17 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetFocusedImage

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

-	else if (strcmp(Name, "SetFocusedImage") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetFocusedImage") == 0) {

+		stack->CorrectParams(1);

 

 		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;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -881,10 +881,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetFocusedImage

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

-	else if (strcmp(Name, "GetFocusedImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageFocus || !_imageFocus->_filename) Stack->PushNULL();

-		else Stack->PushString(_imageFocus->_filename);

+	else if (strcmp(name, "GetFocusedImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageFocus || !_imageFocus->_filename) stack->PushNULL();

+		else stack->PushString(_imageFocus->_filename);

 

 		return S_OK;

 	}

@@ -892,10 +892,10 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetFocusedImageObject

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

-	else if (strcmp(Name, "GetFocusedImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageFocus) Stack->PushNULL();

-		else Stack->PushNative(_imageFocus, true);

+	else if (strcmp(name, "GetFocusedImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageFocus) stack->PushNULL();

+		else stack->PushNative(_imageFocus, true);

 

 		return S_OK;

 	}

@@ -903,31 +903,31 @@ HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// Press

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

-	else if (strcmp(Name, "Press") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "Press") == 0) {

+		stack->CorrectParams(0);

 

 		if (_visible && !_disable) {

 			_oneTimePress = true;

 			_oneTimePressTime = CBPlatform::GetTime();

 		}

-		Stack->PushNULL();

+		stack->PushNULL();

 

 		return S_OK;

 	}

 

 

-	else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CUIObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIButton::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("button");

 		return _scValue;

 	}

@@ -935,7 +935,7 @@ CScValue *CUIButton::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// TextAlign

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

-	else if (strcmp(Name, "TextAlign") == 0) {

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

 		_scValue->SetInt(_align);

 		return _scValue;

 	}

@@ -943,35 +943,35 @@ CScValue *CUIButton::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Focusable

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

-	else if (strcmp(Name, "Focusable") == 0) {

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

 		_scValue->SetBool(_canFocus);

 		return _scValue;

 	}

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

 	// Pressed

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

-	else if (strcmp(Name, "Pressed") == 0) {

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

 		_scValue->SetBool(_stayPressed);

 		return _scValue;

 	}

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

 	// PixelPerfect

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

-	else if (strcmp(Name, "PixelPerfect") == 0) {

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

 		_scValue->SetBool(_pixelPerfect);

 		return _scValue;

 	}

 

-	else return CUIObject::scGetProperty(Name);

+	else return CUIObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIButton::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIButton::scSetProperty(const char *name, CScValue *Value) {

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

 	// TextAlign

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

-	if (strcmp(Name, "TextAlign") == 0) {

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

 		int i = Value->GetInt();

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

 		_align = (TTextAlign)i;

@@ -981,26 +981,26 @@ HRESULT CUIButton::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Focusable

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

-	else if (strcmp(Name, "Focusable") == 0) {

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

 		_canFocus = Value->GetBool();

 		return S_OK;

 	}

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

 	// Pressed

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

-	else if (strcmp(Name, "Pressed") == 0) {

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

 		_stayPressed = Value->GetBool();

 		return S_OK;

 	}

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

 	// PixelPerfect

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

-	else if (strcmp(Name, "PixelPerfect") == 0) {

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

 		_pixelPerfect = Value->GetBool();

 		return S_OK;

 	}

 

-	else return CUIObject::scSetProperty(Name, Value);

+	else return CUIObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/UI/UIButton.h
index bc3ba87257..07bc18bc65 100644
--- a/engines/wintermute/UI/UIButton.h
+++ b/engines/wintermute/UI/UIButton.h
@@ -68,9 +68,9 @@ public:
 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };

 

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index cc98830898..4678f81d9a 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -361,32 +361,32 @@ HRESULT CUIEdit::saveAsText(CBDynBuffer *Buffer, int Indent) {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIEdit::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIEdit::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// SetSelectedFont

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

-	if (strcmp(Name, "SetSelectedFont") == 0) {

-		Stack->CorrectParams(1);

+	if (strcmp(name, "SetSelectedFont") == 0) {

+		stack->CorrectParams(1);

 

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

-		_fontSelected = Game->_fontStorage->AddFont(Stack->Pop()->GetString());

-		Stack->PushBool(_fontSelected != NULL);

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

+		stack->PushBool(_fontSelected != NULL);

 

 		return S_OK;

 	}

 

-	else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CUIObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIEdit::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("editor");

 		return _scValue;

 	}

@@ -394,7 +394,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// SelStart

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

-	else if (strcmp(Name, "SelStart") == 0) {

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

 		_scValue->SetInt(_selStart);

 		return _scValue;

 	}

@@ -402,7 +402,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// SelEnd

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

-	else if (strcmp(Name, "SelEnd") == 0) {

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

 		_scValue->SetInt(_selEnd);

 		return _scValue;

 	}

@@ -410,7 +410,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// CursorBlinkRate

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

-	else if (strcmp(Name, "CursorBlinkRate") == 0) {

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

 		_scValue->SetInt(_cursorBlinkRate);

 		return _scValue;

 	}

@@ -418,7 +418,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// CursorChar

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

-	else if (strcmp(Name, "CursorChar") == 0) {

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

 		_scValue->SetString(_cursorChar);

 		return _scValue;

 	}

@@ -426,7 +426,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// FrameWidth

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

-	else if (strcmp(Name, "FrameWidth") == 0) {

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

 		_scValue->SetInt(_frameWidth);

 		return _scValue;

 	}

@@ -434,7 +434,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// MaxLength

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

-	else if (strcmp(Name, "MaxLength") == 0) {

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

 		_scValue->SetInt(_maxLength);

 		return _scValue;

 	}

@@ -442,7 +442,7 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Text

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

-	else if (strcmp(Name, "Text") == 0) {

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

 		if (Game->_textEncoding == TEXT_UTF8) {

 			WideString wstr = StringUtil::AnsiToWide(_text);

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

@@ -452,16 +452,16 @@ CScValue *CUIEdit::scGetProperty(const char *Name) {
 		return _scValue;

 	}

 

-	else return CUIObject::scGetProperty(Name);

+	else return CUIObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) {

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

 	// SelStart

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

-	if (strcmp(Name, "SelStart") == 0) {

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

 		_selStart = Value->GetInt();

 		_selStart = MAX(_selStart, 0);

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

@@ -471,7 +471,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// SelEnd

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

-	else if (strcmp(Name, "SelEnd") == 0) {

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

 		_selEnd = Value->GetInt();

 		_selEnd = MAX(_selEnd, 0);

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

@@ -481,7 +481,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// CursorBlinkRate

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

-	else if (strcmp(Name, "CursorBlinkRate") == 0) {

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

 		_cursorBlinkRate = Value->GetInt();

 		return S_OK;

 	}

@@ -489,7 +489,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// CursorChar

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

-	else if (strcmp(Name, "CursorChar") == 0) {

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

 		setCursorChar(Value->GetString());

 		return S_OK;

 	}

@@ -497,7 +497,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// FrameWidth

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

-	else if (strcmp(Name, "FrameWidth") == 0) {

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

 		_frameWidth = Value->GetInt();

 		return S_OK;

 	}

@@ -505,7 +505,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// MaxLength

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

-	else if (strcmp(Name, "MaxLength") == 0) {

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

 		_maxLength = Value->GetInt();

 		return S_OK;

 	}

@@ -513,7 +513,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Text

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

-	else if (strcmp(Name, "Text") == 0) {

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

 		if (Game->_textEncoding == TEXT_UTF8) {

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

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

@@ -523,7 +523,7 @@ HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
 		return S_OK;

 	}

 

-	else return CUIObject::scSetProperty(Name, Value);

+	else return CUIObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/UI/UIEdit.h
index 34f849f9fa..8477e6f9d5 100644
--- a/engines/wintermute/UI/UIEdit.h
+++ b/engines/wintermute/UI/UIEdit.h
@@ -61,9 +61,9 @@ public:
 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };

 

diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index deefe965e3..afba22cc49 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -251,15 +251,15 @@ HRESULT CUIEntity::display(int OffsetX, int OffsetY) {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIEntity::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIEntity::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// GetEntity

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

-	if (strcmp(Name, "GetEntity") == 0) {

-		Stack->CorrectParams(0);

+	if (strcmp(name, "GetEntity") == 0) {

+		stack->CorrectParams(0);

 

-		if (_entity) Stack->PushNative(_entity, true);

-		else Stack->PushNULL();

+		if (_entity) stack->PushNative(_entity, true);

+		else stack->PushNULL();

 

 		return S_OK;

 	}

@@ -267,31 +267,31 @@ HRESULT CUIEntity::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetEntity

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

-	else if (strcmp(Name, "SetEntity") == 0) {

-		Stack->CorrectParams(1);

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

+			stack->PushBool(true);

 		else

-			Stack->PushBool(false);

+			stack->PushBool(false);

 

 		return S_OK;

 	}

 

-	else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CUIObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIEntity::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("entity container");

 		return _scValue;

 	}

@@ -299,25 +299,25 @@ CScValue *CUIEntity::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Freezable

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

-	else if (strcmp(Name, "Freezable") == 0) {

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

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

 		else _scValue->SetBool(false);

 		return _scValue;

 	}

 

-	else return CUIObject::scGetProperty(Name);

+	else return CUIObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIEntity::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIEntity::scSetProperty(const char *name, CScValue *Value) {

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

 	// Freezable

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

-	if (strcmp(Name, "Freezable") == 0) {

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

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

 		return S_OK;

-	} else return CUIObject::scSetProperty(Name, Value);

+	} else return CUIObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h
index bd588f7d37..55c5790ef5 100644
--- a/engines/wintermute/UI/UIEntity.h
+++ b/engines/wintermute/UI/UIEntity.h
@@ -47,9 +47,9 @@ public:
 	HRESULT setEntity(const char *Filename);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };

 

diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index 46bfe399f2..c23415287c 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -137,21 +137,21 @@ void CUIObject::correctSize() {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// SetFont

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

-	if (strcmp(Name, "SetFont") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	if (strcmp(name, "SetFont") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 		if (Val->IsNULL()) {

 			_font = NULL;

-			Stack->PushBool(true);

+			stack->PushBool(true);

 		} else {

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

-			Stack->PushBool(_font != NULL);

+			stack->PushBool(_font != NULL);

 		}

 		return S_OK;

 	}

@@ -159,16 +159,16 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetImage

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

-	else if (strcmp(Name, "SetImage") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "SetImage") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

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

 

 		delete _image;

 		_image = NULL;

 		if (Val->IsNULL()) {

-			Stack->PushBool(true);

+			stack->PushBool(true);

 			return S_OK;

 		}

 

@@ -176,8 +176,8 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 		if (!_image || FAILED(_image->loadFile(Val->GetString()))) {

 			delete _image;

 			_image = NULL;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -185,10 +185,10 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetImage

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

-	else if (strcmp(Name, "GetImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_image || !_image->_filename) Stack->PushNULL();

-		else Stack->PushString(_image->_filename);

+	else if (strcmp(name, "GetImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_image || !_image->_filename) stack->PushNULL();

+		else stack->PushString(_image->_filename);

 

 		return S_OK;

 	}

@@ -196,10 +196,10 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetImageObject

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

-	else if (strcmp(Name, "GetImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_image) Stack->PushNULL();

-		else Stack->PushNative(_image, true);

+	else if (strcmp(name, "GetImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_image) stack->PushNULL();

+		else stack->PushNative(_image, true);

 

 		return S_OK;

 	}

@@ -207,25 +207,25 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// Focus

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

-	else if (strcmp(Name, "Focus") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "Focus") == 0) {

+		stack->CorrectParams(0);

 		focus();

-		Stack->PushNULL();

+		stack->PushNULL();

 		return S_OK;

 	}

 

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

 	// MoveAfter / MoveBefore

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

-	else if (strcmp(Name, "MoveAfter") == 0 || strcmp(Name, "MoveBefore") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "MoveAfter") == 0 || strcmp(name, "MoveBefore") == 0) {

+		stack->CorrectParams(1);

 

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

 			CUIWindow *win = (CUIWindow *)_parent;

 

 			int i;

 			bool found = false;

-			CScValue *val = Stack->Pop();

+			CScValue *val = stack->Pop();

 			// find directly

 			if (val->IsNative()) {

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

@@ -251,21 +251,21 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 				bool done = false;

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

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

-						if (strcmp(Name, "MoveAfter") == 0) i++;

+						if (strcmp(name, "MoveAfter") == 0) i++;

 						if (j >= i) j++;

 

 						win->_widgets.InsertAt(i, this);

 						win->_widgets.RemoveAt(j);

 

 						done = true;

-						Stack->PushBool(true);

+						stack->PushBool(true);

 						break;

 					}

 				}

-				if (!done) Stack->PushBool(false);

-			} else Stack->PushBool(false);

+				if (!done) stack->PushBool(false);

+			} else stack->PushBool(false);

 

-		} else Stack->PushBool(false);

+		} else stack->PushBool(false);

 

 		return S_OK;

 	}

@@ -273,8 +273,8 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// MoveToBottom

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

-	else if (strcmp(Name, "MoveToBottom") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "MoveToBottom") == 0) {

+		stack->CorrectParams(0);

 

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

 			CUIWindow *win = (CUIWindow *)_parent;

@@ -285,8 +285,8 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 					break;

 				}

 			}

-			Stack->PushBool(true);

-		} else Stack->PushBool(false);

+			stack->PushBool(true);

+		} else stack->PushBool(false);

 

 		return S_OK;

 	}

@@ -294,8 +294,8 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// MoveToTop

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

-	else if (strcmp(Name, "MoveToTop") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "MoveToTop") == 0) {

+		stack->CorrectParams(0);

 

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

 			CUIWindow *win = (CUIWindow *)_parent;

@@ -306,24 +306,24 @@ HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 					break;

 				}

 			}

-			Stack->PushBool(true);

-		} else Stack->PushBool(false);

+			stack->PushBool(true);

+		} else stack->PushBool(false);

 

 		return S_OK;

 	}

 

-	else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CBObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIObject::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("ui_object");

 		return _scValue;

 	}

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

 	// Name

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

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

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

 		_scValue->SetString(_name);

 		return _scValue;

 	}

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

 	// Parent (RO)

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

-	else if (strcmp(Name, "Parent") == 0) {

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

 		_scValue->SetNative(_parent, true);

 		return _scValue;

 	}

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

 	// ParentNotify

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

-	else if (strcmp(Name, "ParentNotify") == 0) {

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

 		_scValue->SetBool(_parentNotify);

 		return _scValue;

 	}

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

 	// Width

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

-	else if (strcmp(Name, "Width") == 0) {

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

 		_scValue->SetInt(_width);

 		return _scValue;

 	}

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

 	// Height

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

-	else if (strcmp(Name, "Height") == 0) {

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

 		_scValue->SetInt(_height);

 		return _scValue;

 	}

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

 	// Visible

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

-	else if (strcmp(Name, "Visible") == 0) {

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

 		_scValue->SetBool(_visible);

 		return _scValue;

 	}

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

 	// Disabled

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

-	else if (strcmp(Name, "Disabled") == 0) {

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

 		_scValue->SetBool(_disable);

 		return _scValue;

 	}

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

 	// Text

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

-	else if (strcmp(Name, "Text") == 0) {

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

 		_scValue->SetString(_text);

 		return _scValue;

 	}

@@ -395,13 +395,13 @@ CScValue *CUIObject::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// NextSibling (RO) / PrevSibling (RO)

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

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

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

 		_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 (strcmp(name, "NextSibling") == 0) {

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

 					} else {

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

@@ -413,16 +413,16 @@ CScValue *CUIObject::scGetProperty(const char *Name) {
 		return _scValue;

 	}

 

-	else return CBObject::scGetProperty(Name);

+	else return CBObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) {

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

 	// Name

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

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

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

 		setName(Value->GetString());

 		return S_OK;

 	}

@@ -430,7 +430,7 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// ParentNotify

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

-	else if (strcmp(Name, "ParentNotify") == 0) {

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

 		_parentNotify = Value->GetBool();

 		return S_OK;

 	}

@@ -438,7 +438,7 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Width

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

-	else if (strcmp(Name, "Width") == 0) {

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

 		_width = Value->GetInt();

 		return S_OK;

 	}

@@ -446,7 +446,7 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Height

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

-	else if (strcmp(Name, "Height") == 0) {

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

 		_height = Value->GetInt();

 		return S_OK;

 	}

@@ -454,7 +454,7 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Visible

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

-	else if (strcmp(Name, "Visible") == 0) {

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

 		_visible = Value->GetBool();

 		return S_OK;

 	}

@@ -462,7 +462,7 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Disabled

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

-	else if (strcmp(Name, "Disabled") == 0) {

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

 		_disable = Value->GetBool();

 		return S_OK;

 	}

@@ -470,12 +470,12 @@ HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Text

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

-	else if (strcmp(Name, "Text") == 0) {

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

 		setText(Value->GetString());

 		return S_OK;

 	}

 

-	else return CBObject::scSetProperty(Name, Value);

+	else return CBObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIObject.h b/engines/wintermute/UI/UIObject.h
index 7e16041bbe..bc49c01a2f 100644
--- a/engines/wintermute/UI/UIObject.h
+++ b/engines/wintermute/UI/UIObject.h
@@ -72,9 +72,9 @@ public:
 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };

 

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 4eaa114a83..e5b89e15df 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -376,39 +376,39 @@ HRESULT CUIText::saveAsText(CBDynBuffer *Buffer, int Indent) {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIText::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIText::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// SizeToFit

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

-	if (strcmp(Name, "SizeToFit") == 0) {

-		Stack->CorrectParams(0);

+	if (strcmp(name, "SizeToFit") == 0) {

+		stack->CorrectParams(0);

 		SizeToFit();

-		Stack->PushNULL();

+		stack->PushNULL();

 		return S_OK;

 	}

 

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

 	// HeightToFit

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

-	else if (strcmp(Name, "HeightToFit") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "HeightToFit") == 0) {

+		stack->CorrectParams(0);

 		if (_font && _text) _height = _font->getTextHeight((byte *)_text, _width);

-		Stack->PushNULL();

+		stack->PushNULL();

 		return S_OK;

 	}

 

-	else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CUIObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIText::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("static");

 		return _scValue;

 	}

@@ -416,7 +416,7 @@ CScValue *CUIText::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// TextAlign

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

-	else if (strcmp(Name, "TextAlign") == 0) {

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

 		_scValue->SetInt(_textAlign);

 		return _scValue;

 	}

@@ -424,21 +424,21 @@ CScValue *CUIText::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// VerticalAlign

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

-	else if (strcmp(Name, "VerticalAlign") == 0) {

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

 		_scValue->SetInt(_verticalAlign);

 		return _scValue;

 	}

 

-	else return CUIObject::scGetProperty(Name);

+	else return CUIObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIText::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIText::scSetProperty(const char *name, CScValue *Value) {

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

 	// TextAlign

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

-	if (strcmp(Name, "TextAlign") == 0) {

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

 		int i = Value->GetInt();

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

 		_textAlign = (TTextAlign)i;

@@ -448,14 +448,14 @@ HRESULT CUIText::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// VerticalAlign

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

-	else if (strcmp(Name, "VerticalAlign") == 0) {

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

 		int i = Value->GetInt();

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

 		_verticalAlign = (TVerticalAlign)i;

 		return S_OK;

 	}

 

-	else return CUIObject::scSetProperty(Name, Value);

+	else return CUIObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h
index aac9caf896..bb0b6a4d84 100644
--- a/engines/wintermute/UI/UIText.h
+++ b/engines/wintermute/UI/UIText.h
@@ -48,9 +48,9 @@ public:
 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };

 

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index 38fefc4cc7..4e0590ab15 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -670,18 +670,18 @@ HRESULT CUIWindow::saveAsText(CBDynBuffer *Buffer, int Indent) {
 }

 

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

-HRESULT CUIWindow::enableWidget(const char *Name, bool Enable) {

+HRESULT CUIWindow::enableWidget(const char *name, bool Enable) {

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

-		if (scumm_stricmp(_widgets[i]->_name, Name) == 0) _widgets[i]->_disable = !Enable;

+		if (scumm_stricmp(_widgets[i]->_name, name) == 0) _widgets[i]->_disable = !Enable;

 	}

 	return S_OK;

 }

 

 

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

-HRESULT CUIWindow::showWidget(const char *Name, bool Visible) {

+HRESULT CUIWindow::showWidget(const char *name, bool Visible) {

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

-		if (scumm_stricmp(_widgets[i]->_name, Name) == 0) _widgets[i]->_visible = Visible;

+		if (scumm_stricmp(_widgets[i]->_name, name) == 0) _widgets[i]->_visible = Visible;

 	}

 	return S_OK;

 }

@@ -690,25 +690,25 @@ HRESULT CUIWindow::showWidget(const char *Name, bool Visible) {
 //////////////////////////////////////////////////////////////////////////

 // high level scripting interface

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

-HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {

+HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {

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

 	// GetWidget / GetControl

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

-	if (strcmp(Name, "GetWidget") == 0 || strcmp(Name, "GetControl") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *val = Stack->Pop();

+	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 (widget < 0 || widget >= _widgets.GetSize()) Stack->PushNULL();

-			else Stack->PushNative(_widgets[widget], true);

+			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) {

-					Stack->PushNative(_widgets[i], true);

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

 					return S_OK;

 				}

 			}

-			Stack->PushNULL();

+			stack->PushNULL();

 		}

 

 		return S_OK;

@@ -717,12 +717,12 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetInactiveFont

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

-	else if (strcmp(Name, "SetInactiveFont") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetInactiveFont") == 0) {

+		stack->CorrectParams(1);

 

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

-		_fontInactive = Game->_fontStorage->AddFont(Stack->Pop()->GetString());

-		Stack->PushBool(_fontInactive != NULL);

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

+		stack->PushBool(_fontInactive != NULL);

 

 		return S_OK;

 	}

@@ -730,17 +730,17 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// SetInactiveImage

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

-	else if (strcmp(Name, "SetInactiveImage") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "SetInactiveImage") == 0) {

+		stack->CorrectParams(1);

 

 		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;

-			Stack->PushBool(false);

-		} else Stack->PushBool(true);

+			stack->PushBool(false);

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -748,10 +748,10 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetInactiveImage

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

-	else if (strcmp(Name, "GetInactiveImage") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageInactive || !_imageInactive->_filename) Stack->PushNULL();

-		else Stack->PushString(_imageInactive->_filename);

+	else if (strcmp(name, "GetInactiveImage") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageInactive || !_imageInactive->_filename) stack->PushNULL();

+		else stack->PushString(_imageInactive->_filename);

 

 		return S_OK;

 	}

@@ -759,10 +759,10 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// GetInactiveImageObject

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

-	else if (strcmp(Name, "GetInactiveImageObject") == 0) {

-		Stack->CorrectParams(0);

-		if (!_imageInactive) Stack->PushNULL();

-		else Stack->PushNative(_imageInactive, true);

+	else if (strcmp(name, "GetInactiveImageObject") == 0) {

+		stack->CorrectParams(0);

+		if (!_imageInactive) stack->PushNULL();

+		else stack->PushNative(_imageInactive, true);

 

 		return S_OK;

 	}

@@ -771,56 +771,56 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// Close

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

-	else if (strcmp(Name, "Close") == 0) {

-		Stack->CorrectParams(0);

-		Stack->PushBool(SUCCEEDED(close()));

+	else if (strcmp(name, "Close") == 0) {

+		stack->CorrectParams(0);

+		stack->PushBool(SUCCEEDED(close()));

 		return S_OK;

 	}

 

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

 	// GoExclusive

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

-	else if (strcmp(Name, "GoExclusive") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "GoExclusive") == 0) {

+		stack->CorrectParams(0);

 		goExclusive();

-		Script->WaitFor(this);

-		Stack->PushNULL();

+		script->WaitFor(this);

+		stack->PushNULL();

 		return S_OK;

 	}

 

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

 	// GoSystemExclusive

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

-	else if (strcmp(Name, "GoSystemExclusive") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "GoSystemExclusive") == 0) {

+		stack->CorrectParams(0);

 		goSystemExclusive();

-		Script->WaitFor(this);

-		Stack->PushNULL();

+		script->WaitFor(this);

+		stack->PushNULL();

 		return S_OK;

 	}

 

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

 	// Center

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

-	else if (strcmp(Name, "Center") == 0) {

-		Stack->CorrectParams(0);

+	else if (strcmp(name, "Center") == 0) {

+		stack->CorrectParams(0);

 		_posX = (Game->_renderer->_width - _width) / 2;

 		_posY = (Game->_renderer->_height - _height) / 2;

-		Stack->PushNULL();

+		stack->PushNULL();

 		return S_OK;

 	}

 

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

 	// LoadFromFile

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

-	else if (strcmp(Name, "LoadFromFile") == 0) {

-		Stack->CorrectParams(1);

+	else if (strcmp(name, "LoadFromFile") == 0) {

+		stack->CorrectParams(1);

 

-		CScValue *Val = Stack->Pop();

+		CScValue *Val = stack->Pop();

 		cleanup();

 		if (!Val->IsNULL()) {

-			Stack->PushBool(SUCCEEDED(loadFile(Val->GetString())));

-		} else Stack->PushBool(true);

+			stack->PushBool(SUCCEEDED(loadFile(Val->GetString())));

+		} else stack->PushBool(true);

 

 		return S_OK;

 	}

@@ -828,13 +828,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// CreateButton

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

-	else if (strcmp(Name, "CreateButton") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "CreateButton") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

 		CUIButton *Btn = new CUIButton(Game);

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

-		Stack->PushNative(Btn, true);

+		stack->PushNative(Btn, true);

 

 		Btn->_parent = this;

 		_widgets.Add(Btn);

@@ -845,13 +845,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// CreateStatic

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

-	else if (strcmp(Name, "CreateStatic") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "CreateStatic") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

 		CUIText *Sta = new CUIText(Game);

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

-		Stack->PushNative(Sta, true);

+		stack->PushNative(Sta, true);

 

 		Sta->_parent = this;

 		_widgets.Add(Sta);

@@ -862,13 +862,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// CreateEditor

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

-	else if (strcmp(Name, "CreateEditor") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "CreateEditor") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

 		CUIEdit *Edi = new CUIEdit(Game);

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

-		Stack->PushNative(Edi, true);

+		stack->PushNative(Edi, true);

 

 		Edi->_parent = this;

 		_widgets.Add(Edi);

@@ -879,13 +879,13 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// CreateWindow

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

-	else if (strcmp(Name, "CreateWindow") == 0) {

-		Stack->CorrectParams(1);

-		CScValue *Val = Stack->Pop();

+	else if (strcmp(name, "CreateWindow") == 0) {

+		stack->CorrectParams(1);

+		CScValue *Val = stack->Pop();

 

 		CUIWindow *Win = new CUIWindow(Game);

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

-		Stack->PushNative(Win, true);

+		stack->PushNative(Win, true);

 

 		Win->_parent = this;

 		_widgets.Add(Win);

@@ -896,9 +896,9 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 	//////////////////////////////////////////////////////////////////////////

 	// DeleteControl / DeleteButton / DeleteStatic / DeleteEditor / DeleteWindow

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

-	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();

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

 

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

@@ -908,22 +908,22 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th
 				if (val->GetType() == VAL_VARIABLE_REF) val->SetNULL();

 			}

 		}

-		Stack->PushNULL();

+		stack->PushNULL();

 		return S_OK;

-	} else if SUCCEEDED(Game->WindowScriptMethodHook(this, Script, Stack, Name)) return S_OK;

+	} else if SUCCEEDED(Game->WindowScriptMethodHook(this, script, stack, name)) return S_OK;

 

-	else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);

+	else return CUIObject::scCallMethod(script, stack, thisStack, name);

 }

 

 

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

-CScValue *CUIWindow::scGetProperty(const char *Name) {

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

 	_scValue->SetNULL();

 

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

 	// Type

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

-	if (strcmp(Name, "Type") == 0) {

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

 		_scValue->SetString("window");

 		return _scValue;

 	}

@@ -931,7 +931,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// NumWidgets / NumControls (RO)

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

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

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

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

 		return _scValue;

 	}

@@ -939,7 +939,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Exclusive

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

-	else if (strcmp(Name, "Exclusive") == 0) {

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

 		_scValue->SetBool(_mode == WINDOW_EXCLUSIVE);

 		return _scValue;

 	}

@@ -947,7 +947,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// SystemExclusive

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

-	else if (strcmp(Name, "SystemExclusive") == 0) {

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

 		_scValue->SetBool(_mode == WINDOW_SYSTEM_EXCLUSIVE);

 		return _scValue;

 	}

@@ -955,7 +955,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Menu

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

-	else if (strcmp(Name, "Menu") == 0) {

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

 		_scValue->SetBool(_isMenu);

 		return _scValue;

 	}

@@ -963,7 +963,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// InGame

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

-	else if (strcmp(Name, "InGame") == 0) {

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

 		_scValue->SetBool(_inGame);

 		return _scValue;

 	}

@@ -971,7 +971,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// PauseMusic

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

-	else if (strcmp(Name, "PauseMusic") == 0) {

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

 		_scValue->SetBool(_pauseMusic);

 		return _scValue;

 	}

@@ -979,7 +979,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// ClipContents

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

-	else if (strcmp(Name, "ClipContents") == 0) {

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

 		_scValue->SetBool(_clipContents);

 		return _scValue;

 	}

@@ -987,7 +987,7 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// Transparent

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

-	else if (strcmp(Name, "Transparent") == 0) {

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

 		_scValue->SetBool(_transparent);

 		return _scValue;

 	}

@@ -995,21 +995,21 @@ CScValue *CUIWindow::scGetProperty(const char *Name) {
 	//////////////////////////////////////////////////////////////////////////

 	// FadeColor

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

-	else if (strcmp(Name, "FadeColor") == 0) {

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

 		_scValue->SetInt((int)_fadeColor);

 		return _scValue;

 	}

 

-	else return CUIObject::scGetProperty(Name);

+	else return CUIObject::scGetProperty(name);

 }

 

 

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

-HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {

+HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) {

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

 	// Name

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

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

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

 		setName(Value->GetString());

 		return S_OK;

 	}

@@ -1017,7 +1017,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Menu

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

-	else if (strcmp(Name, "Menu") == 0) {

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

 		_isMenu = Value->GetBool();

 		return S_OK;

 	}

@@ -1025,7 +1025,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// InGame

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

-	else if (strcmp(Name, "InGame") == 0) {

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

 		_inGame = Value->GetBool();

 		return S_OK;

 	}

@@ -1033,7 +1033,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// PauseMusic

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

-	else if (strcmp(Name, "PauseMusic") == 0) {

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

 		_pauseMusic = Value->GetBool();

 		return S_OK;

 	}

@@ -1041,7 +1041,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// ClipContents

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

-	else if (strcmp(Name, "ClipContents") == 0) {

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

 		_clipContents = Value->GetBool();

 		return S_OK;

 	}

@@ -1049,7 +1049,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Transparent

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

-	else if (strcmp(Name, "Transparent") == 0) {

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

 		_transparent = Value->GetBool();

 		return S_OK;

 	}

@@ -1057,7 +1057,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// FadeColor

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

-	else if (strcmp(Name, "FadeColor") == 0) {

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

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

 		_fadeBackground = (_fadeColor != 0);

 		return S_OK;

@@ -1066,7 +1066,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// Exclusive

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

-	else if (strcmp(Name, "Exclusive") == 0) {

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

 		if (Value->GetBool())

 			goExclusive();

 		else {

@@ -1079,7 +1079,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 	//////////////////////////////////////////////////////////////////////////

 	// SystemExclusive

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

-	else if (strcmp(Name, "SystemExclusive") == 0) {

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

 		if (Value->GetBool())

 			goSystemExclusive();

 		else {

@@ -1089,7 +1089,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
 		return S_OK;

 	}

 

-	else return CUIObject::scSetProperty(Name, Value);

+	else return CUIObject::scSetProperty(name, Value);

 }

 

 

diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h
index e86409e43c..e22a09027d 100644
--- a/engines/wintermute/UI/UIWindow.h
+++ b/engines/wintermute/UI/UIWindow.h
@@ -63,8 +63,8 @@ public:
 	bool _dragging;

 	DECLARE_PERSISTENT(CUIWindow, CUIObject)

 	bool _transparent;

-	HRESULT showWidget(const char *Name, bool Visible = true);

-	HRESULT enableWidget(const char *Name, bool Enable = true);

+	HRESULT showWidget(const char *name, bool Visible = true);

+	HRESULT enableWidget(const char *name, bool Enable = true);

 	RECT _titleRect;

 	RECT _dragRect;

 	virtual HRESULT display(int OffsetX = 0, int OffsetY = 0);

@@ -82,9 +82,9 @@ public:
 	virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 

 	// scripting interface

-	virtual CScValue *scGetProperty(const char *Name);

-	virtual HRESULT scSetProperty(const char *Name, CScValue *Value);

-	virtual HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);

+	virtual CScValue *scGetProperty(const char *name);

+	virtual HRESULT scSetProperty(const char *name, CScValue *Value);

+	virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);

 	virtual const char *scToString();

 };