WINTERMUTE: Mass-rename "Value"->"value"

59 files changed, 301 insertions, 301 deletions

diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 7e76ab4737..5653ed2f24 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -1035,12 +1035,12 @@ CScValue *CAdActor::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdActor::scSetProperty(const char *name, CScValue *value) {

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

 	// Direction

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

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

-		int dir = Value->GetInt();

+		int dir = value->GetInt();

 		if (dir >= 0 && dir < NUM_DIRECTIONS) _dir = (TDirection)dir;

 		return S_OK;

 	}

@@ -1049,8 +1049,8 @@ HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {
 	// TalkAnimName

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

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

-		if (Value->IsNULL()) _talkAnimName = "talk";

-		else _talkAnimName = Value->GetString();

+		if (value->IsNULL()) _talkAnimName = "talk";

+		else _talkAnimName = value->GetString();

 		return S_OK;

 	}

 

@@ -1058,8 +1058,8 @@ HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {
 	// WalkAnimName

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

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

-		if (Value->IsNULL()) _walkAnimName = "walk";

-		else _walkAnimName = Value->GetString();

+		if (value->IsNULL()) _walkAnimName = "walk";

+		else _walkAnimName = value->GetString();

 		return S_OK;

 	}

 

@@ -1067,8 +1067,8 @@ HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {
 	// IdleAnimName

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

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

-		if (Value->IsNULL()) _idleAnimName = "idle";

-		else _idleAnimName = Value->GetString();

+		if (value->IsNULL()) _idleAnimName = "idle";

+		else _idleAnimName = value->GetString();

 		return S_OK;

 	}

 

@@ -1076,8 +1076,8 @@ HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {
 	// TurnLeftAnimName

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

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

-		if (Value->IsNULL()) _turnLeftAnimName = "turnleft";

-		else _turnLeftAnimName = Value->GetString();

+		if (value->IsNULL()) _turnLeftAnimName = "turnleft";

+		else _turnLeftAnimName = value->GetString();

 		return S_OK;

 	}

 

@@ -1085,12 +1085,12 @@ HRESULT CAdActor::scSetProperty(const char *name, CScValue *Value) {
 	// TurnRightAnimName

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

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

-		if (Value->IsNULL()) _turnRightAnimName = "turnright";

-		else _turnRightAnimName = Value->GetString();

+		if (value->IsNULL()) _turnRightAnimName = "turnright";

+		else _turnRightAnimName = value->GetString();

 		return S_OK;

 	}

 

-	else return CAdTalkHolder::scSetProperty(name, Value);

+	else return CAdTalkHolder::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/Ad/AdEntity.h
index f06814352d..c2d73a4204 100644
--- a/engines/wintermute/Ad/AdEntity.h
+++ b/engines/wintermute/Ad/AdEntity.h
@@ -57,7 +57,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 34d9c600a7..5bf1b6691c 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -952,25 +952,25 @@ CScValue *CAdGame::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdGame::scSetProperty(const char *name, CScValue *value) {

 

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

 	// SelectedItem

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

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

-		if (Value->IsNULL()) _selectedItem = NULL;

+		if (value->IsNULL()) _selectedItem = NULL;

 		else {

-			if (Value->IsNative()) {

+			if (value->IsNative()) {

 				_selectedItem = NULL;

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

-					if (_items[i] == Value->GetNative()) {

-						_selectedItem = (CAdItem *)Value->GetNative();

+					if (_items[i] == value->GetNative()) {

+						_selectedItem = (CAdItem *)value->GetNative();

 						break;

 					}

 				}

 			} else {

 				// try to get by name

-				_selectedItem = GetItemByName(Value->GetString());

+				_selectedItem = GetItemByName(value->GetString());

 			}

 		}

 

@@ -981,7 +981,7 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	// SmartItemCursor

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

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

-		_smartItemCursor = Value->GetBool();

+		_smartItemCursor = value->GetBool();

 		return S_OK;

 	}

 

@@ -989,7 +989,7 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	// InventoryVisible

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

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

-		if (_inventoryBox) _inventoryBox->_visible = Value->GetBool();

+		if (_inventoryBox) _inventoryBox->_visible = value->GetBool();

 		return S_OK;

 	}

 

@@ -999,9 +999,9 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	else if (strcmp(name, "InventoryObject") == 0) {

 		if (_inventoryOwner && _inventoryBox) _inventoryOwner->getInventory()->_scrollOffset = _inventoryBox->_scrollOffset;

 

-		if (Value->IsNULL()) _inventoryOwner = _invObject;

+		if (value->IsNULL()) _inventoryOwner = _invObject;

 		else {

-			CBObject *Obj = (CBObject *)Value->GetNative();

+			CBObject *Obj = (CBObject *)value->GetNative();

 			if (Obj == this) _inventoryOwner = _invObject;

 			else if (Game->ValidObject(Obj)) _inventoryOwner = (CAdObject *)Obj;

 		}

@@ -1015,7 +1015,7 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	// InventoryScrollOffset

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

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

-		if (_inventoryBox) _inventoryBox->_scrollOffset = Value->GetInt();

+		if (_inventoryBox) _inventoryBox->_scrollOffset = value->GetInt();

 		return S_OK;

 	}

 

@@ -1023,7 +1023,7 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	// TalkSkipButton

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

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

-		int Val = Value->GetInt();

+		int Val = value->GetInt();

 		if (Val < 0) Val = 0;

 		if (Val > TALK_SKIP_NONE) Val = TALK_SKIP_NONE;

 		_talkSkipButton = (TTalkSkipButton)Val;

@@ -1034,15 +1034,15 @@ HRESULT CAdGame::scSetProperty(const char *name, CScValue *Value) {
 	// StartupScene

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

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

-		if (Value == NULL) {

+		if (value == NULL) {

 			delete[] _startupScene;

 			_startupScene = NULL;

-		} else CBUtils::SetString(&_startupScene, Value->GetString());

+		} else CBUtils::SetString(&_startupScene, value->GetString());

 

 		return S_OK;

 	}

 

-	else return CBGame::scSetProperty(name, Value);

+	else return CBGame::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h
index c9fbbadc6f..ad6785a8ff 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -152,7 +152,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

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

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

 	bool ValidMouse();

 };

diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index f9b92afba6..4388aef86c 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -648,12 +648,12 @@ CScValue *CAdItem::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdItem::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

 	}

 

@@ -661,7 +661,7 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// DisplayAmount

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

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

-		_displayAmount = Value->GetBool();

+		_displayAmount = value->GetBool();

 		return S_OK;

 	}

 

@@ -669,7 +669,7 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// Amount

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

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

-		_amount = Value->GetInt();

+		_amount = value->GetInt();

 		return S_OK;

 	}

 

@@ -677,7 +677,7 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// AmountOffsetX

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

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

-		_amountOffsetX = Value->GetInt();

+		_amountOffsetX = value->GetInt();

 		return S_OK;

 	}

 

@@ -685,7 +685,7 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// AmountOffsetY

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

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

-		_amountOffsetY = Value->GetInt();

+		_amountOffsetY = value->GetInt();

 		return S_OK;

 	}

 

@@ -693,7 +693,7 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// AmountAlign

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

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

-		_amountAlign = (TTextAlign)Value->GetInt();

+		_amountAlign = (TTextAlign)value->GetInt();

 		return S_OK;

 	}

 

@@ -701,11 +701,11 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// AmountString

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

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

-		if (Value->IsNULL()) {

+		if (value->IsNULL()) {

 			delete[] _amountString;

 			_amountString = NULL;

 		} else {

-			CBUtils::SetString(&_amountString, Value->GetString());

+			CBUtils::SetString(&_amountString, value->GetString());

 		}

 		return S_OK;

 	}

@@ -714,11 +714,11 @@ HRESULT CAdItem::scSetProperty(const char *name, CScValue *Value) {
 	// CursorCombined

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

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

-		_cursorCombined = Value->GetBool();

+		_cursorCombined = value->GetBool();

 		return S_OK;

 	}

 

-	else return CAdTalkHolder::scSetProperty(name, Value);

+	else return CAdTalkHolder::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Ad/AdItem.h b/engines/wintermute/Ad/AdItem.h
index c80cbee7d4..ad59048e53 100644
--- a/engines/wintermute/Ad/AdItem.h
+++ b/engines/wintermute/Ad/AdItem.h
@@ -60,7 +60,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index 7f1d09ef59..cf82e9db87 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -421,12 +421,12 @@ CScValue *CAdLayer::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdLayer::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdLayer::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

 	}

 

@@ -434,7 +434,7 @@ HRESULT CAdLayer::scSetProperty(const char *name, CScValue *Value) {
 	// CloseUp

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

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

-		_closeUp = Value->GetBool();

+		_closeUp = value->GetBool();

 		return S_OK;

 	}

 

@@ -442,7 +442,7 @@ HRESULT CAdLayer::scSetProperty(const char *name, CScValue *Value) {
 	// Width

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

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

-		_width = Value->GetInt();

+		_width = value->GetInt();

 		if (_width < 0) _width = 0;

 		return S_OK;

 	}

@@ -451,7 +451,7 @@ HRESULT CAdLayer::scSetProperty(const char *name, CScValue *Value) {
 	// Height

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

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

-		_height = Value->GetInt();

+		_height = value->GetInt();

 		if (_height < 0) _height = 0;

 		return S_OK;

 	}

@@ -460,14 +460,14 @@ HRESULT CAdLayer::scSetProperty(const char *name, CScValue *Value) {
 	// Active

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

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

-		bool b = Value->GetBool();

+		bool b = value->GetBool();

 		if (b == false && _main) {

 			Game->LOG(0, "Warning: cannot deactivate scene's main layer");

 		} else _active = b;

 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Ad/AdLayer.h b/engines/wintermute/Ad/AdLayer.h
index 059eac06dc..7c2c595fa2 100644
--- a/engines/wintermute/Ad/AdLayer.h
+++ b/engines/wintermute/Ad/AdLayer.h
@@ -48,7 +48,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 38c2ab94d7..5af718db48 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -715,13 +715,13 @@ CScValue *CAdObject::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdObject::scSetProperty(const char *name, CScValue *value) {

 

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

 	// Active

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

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

-		_active = Value->GetBool();

+		_active = value->GetBool();

 		return S_OK;

 	}

 

@@ -729,7 +729,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// IgnoreItems

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

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

-		_ignoreItems = Value->GetBool();

+		_ignoreItems = value->GetBool();

 		return S_OK;

 	}

 

@@ -737,7 +737,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SceneIndependent

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

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

-		_sceneIndependent = Value->GetBool();

+		_sceneIndependent = value->GetBool();

 		return S_OK;

 	}

 

@@ -745,7 +745,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SubtitlesWidth

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

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

-		_subtitlesWidth = Value->GetInt();

+		_subtitlesWidth = value->GetInt();

 		return S_OK;

 	}

 

@@ -753,7 +753,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SubtitlesPosRelative

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

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

-		_subtitlesModRelative = Value->GetBool();

+		_subtitlesModRelative = value->GetBool();

 		return S_OK;

 	}

 

@@ -761,7 +761,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SubtitlesPosX

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

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

-		_subtitlesModX = Value->GetInt();

+		_subtitlesModX = value->GetInt();

 		return S_OK;

 	}

 

@@ -769,7 +769,7 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SubtitlesPosY

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

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

-		_subtitlesModY = Value->GetInt();

+		_subtitlesModY = value->GetInt();

 		return S_OK;

 	}

 

@@ -777,11 +777,11 @@ HRESULT CAdObject::scSetProperty(const char *name, CScValue *Value) {
 	// SubtitlesPosXCenter

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

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

-		_subtitlesModXCenter = Value->GetBool();

+		_subtitlesModXCenter = value->GetBool();

 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 44a7fb8e37..462a53c9f7 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -294,12 +294,12 @@ CScValue *CAdRegion::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdRegion::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdRegion::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

 	}

 

@@ -307,7 +307,7 @@ HRESULT CAdRegion::scSetProperty(const char *name, CScValue *Value) {
 	// Blocked

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

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

-		_blocked = Value->GetBool();

+		_blocked = value->GetBool();

 		return S_OK;

 	}

 

@@ -315,7 +315,7 @@ HRESULT CAdRegion::scSetProperty(const char *name, CScValue *Value) {
 	// Decoration

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

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

-		_decoration = Value->GetBool();

+		_decoration = value->GetBool();

 		return S_OK;

 	}

 

@@ -323,7 +323,7 @@ HRESULT CAdRegion::scSetProperty(const char *name, CScValue *Value) {
 	// Scale

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

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

-		_zoom = Value->GetFloat();

+		_zoom = value->GetFloat();

 		return S_OK;

 	}

 

@@ -331,11 +331,11 @@ HRESULT CAdRegion::scSetProperty(const char *name, CScValue *Value) {
 	// AlphaColor

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

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

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

+		_alpha = (uint32)value->GetInt();

 		return S_OK;

 	}

 

-	else return CBRegion::scSetProperty(name, Value);

+	else return CBRegion::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Ad/AdRegion.h b/engines/wintermute/Ad/AdRegion.h
index 237936f578..15b794641b 100644
--- a/engines/wintermute/Ad/AdRegion.h
+++ b/engines/wintermute/Ad/AdRegion.h
@@ -48,7 +48,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 1f86fa77fb..69a95df4d2 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -1842,12 +1842,12 @@ CScValue *CAdScene::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdScene::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

 	}

 

@@ -1855,7 +1855,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// AutoScroll

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

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

-		_autoScroll = Value->GetBool();

+		_autoScroll = value->GetBool();

 		return S_OK;

 	}

 

@@ -1863,7 +1863,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// PersistentState

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

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

-		_persistentState = Value->GetBool();

+		_persistentState = value->GetBool();

 		return S_OK;

 	}

 

@@ -1871,7 +1871,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// PersistentStateSprites

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

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

-		_persistentStateSprites = Value->GetBool();

+		_persistentStateSprites = value->GetBool();

 		return S_OK;

 	}

 

@@ -1879,7 +1879,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// ScrollPixelsX

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

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

-		_scrollPixelsH = Value->GetInt();

+		_scrollPixelsH = value->GetInt();

 		return S_OK;

 	}

 

@@ -1887,7 +1887,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// ScrollPixelsY

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

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

-		_scrollPixelsV = Value->GetInt();

+		_scrollPixelsV = value->GetInt();

 		return S_OK;

 	}

 

@@ -1895,7 +1895,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// ScrollSpeedX

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

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

-		_scrollTimeH = Value->GetInt();

+		_scrollTimeH = value->GetInt();

 		return S_OK;

 	}

 

@@ -1903,7 +1903,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// ScrollSpeedY

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

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

-		_scrollTimeV = Value->GetInt();

+		_scrollTimeV = value->GetInt();

 		return S_OK;

 	}

 

@@ -1911,7 +1911,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// OffsetX

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

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

-		_offsetLeft = Value->GetInt();

+		_offsetLeft = value->GetInt();

 

 		int ViewportWidth, ViewportHeight;

 		getViewportSize(&ViewportWidth, &ViewportHeight);

@@ -1927,7 +1927,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 	// OffsetY

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

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

-		_offsetTop = Value->GetInt();

+		_offsetTop = value->GetInt();

 

 		int ViewportWidth, ViewportHeight;

 		getViewportSize(&ViewportWidth, &ViewportHeight);

@@ -1939,7 +1939,7 @@ HRESULT CAdScene::scSetProperty(const char *name, CScValue *Value) {
 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h
index 6c6f16eea0..037e5abeca 100644
--- a/engines/wintermute/Ad/AdScene.h
+++ b/engines/wintermute/Ad/AdScene.h
@@ -157,7 +157,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp
index 8c7ffdd49d..924dcb9b96 100644
--- a/engines/wintermute/Ad/AdTalkHolder.cpp
+++ b/engines/wintermute/Ad/AdTalkHolder.cpp
@@ -311,7 +311,7 @@ HRESULT CAdTalkHolder::scSetProperty(const char *name, CScValue *value) {
 	// Item

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

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

-	    SetItem(Value->GetString());

+	    SetItem(value->GetString());

 	    return S_OK;

 	}

 

diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 1e60c33b6a..f3dd9581b6 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -224,16 +224,16 @@ CScValue *CAdWaypointGroup::scGetProperty(const char *name) {
 

 

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

-HRESULT CAdWaypointGroup::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CAdWaypointGroup::scSetProperty(const char *name, CScValue *value) {

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

 	// Active

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

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

-		_active = Value->GetBool();

+		_active = value->GetBool();

 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Ad/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h
index fda11b88c4..bc4b9420f1 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.h
+++ b/engines/wintermute/Ad/AdWaypointGroup.h
@@ -50,7 +50,7 @@ public:
 	CBArray<CBPoint *, CBPoint *> _points;

 	int _editorSelectedPoint;

 	virtual CScValue *scGetProperty(const char *name);

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

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

 };

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/Base/BDebugger.cpp b/engines/wintermute/Base/BDebugger.cpp
index ab73493e69..1a3b3fdb35 100644
--- a/engines/wintermute/Base/BDebugger.cpp
+++ b/engines/wintermute/Base/BDebugger.cpp
@@ -113,7 +113,7 @@ HRESULT CBDebugger::OnVariableInit(EWmeDebuggerVariableType Type, CScScript *scr
 }

 

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

-HRESULT CBDebugger::OnVariableChangeValue(CScValue *Var, CScValue *Value) {

+HRESULT CBDebugger::OnVariableChangeValue(CScValue *Var, CScValue *value) {

 	return S_OK;

 }

 

diff --git a/engines/wintermute/Base/BDebugger.h b/engines/wintermute/Base/BDebugger.h
index de9c8f6b7c..db1b6784f7 100644
--- a/engines/wintermute/Base/BDebugger.h
+++ b/engines/wintermute/Base/BDebugger.h
@@ -60,7 +60,7 @@ public:
 	HRESULT OnScriptChangeScope(CScScript *Script, CScValue *Scope);

 	HRESULT OnScriptShutdownScope(CScScript *Script, CScValue *Scope);

 	HRESULT OnVariableInit(EWmeDebuggerVariableType Type, CScScript *script, CScValue *Scope, CScValue *Var, const char *VariableName);

-	HRESULT OnVariableChangeValue(CScValue *Var, CScValue *Value);

+	HRESULT OnVariableChangeValue(CScValue *Var, CScValue *value);

 

 	HRESULT OnScriptHitBreakpoint(CScScript *script);

 

diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index 75cf1e02c2..755321de11 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -650,12 +650,12 @@ CScValue *CBFrame::scGetProperty(const char *name) {
 

 

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

-HRESULT CBFrame::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBFrame::scSetProperty(const char *name, CScValue *value) {

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

 	// Delay

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

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

-		_delay = MAX(0, Value->GetInt());

+		_delay = MAX(0, value->GetInt());

 		return S_OK;

 	}

 

@@ -663,7 +663,7 @@ HRESULT CBFrame::scSetProperty(const char *name, CScValue *Value) {
 	// Keyframe

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

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

-		_keyframe = Value->GetBool();

+		_keyframe = value->GetBool();

 		return S_OK;

 	}

 

@@ -671,7 +671,7 @@ HRESULT CBFrame::scSetProperty(const char *name, CScValue *Value) {
 	// KillSounds

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

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

-		_killSound = Value->GetBool();

+		_killSound = value->GetBool();

 		return S_OK;

 	}

 

@@ -679,7 +679,7 @@ HRESULT CBFrame::scSetProperty(const char *name, CScValue *Value) {
 	// MoveX

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

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

-		_moveX = Value->GetInt();

+		_moveX = value->GetInt();

 		return S_OK;

 	}

 

@@ -687,14 +687,14 @@ HRESULT CBFrame::scSetProperty(const char *name, CScValue *Value) {
 	// MoveY

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

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

-		_moveY = Value->GetInt();

+		_moveY = value->GetInt();

 		return S_OK;

 	}

 

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

 	else {

-		if (_subframes.GetSize() == 1) return _subframes[0]->scSetProperty(name, Value);

-		else return CBScriptable::scSetProperty(name, Value);

+		if (_subframes.GetSize() == 1) return _subframes[0]->scSetProperty(name, value);

+		else return CBScriptable::scSetProperty(name, value);

 	}

 }

 

diff --git a/engines/wintermute/Base/BFrame.h b/engines/wintermute/Base/BFrame.h
index 3c0efae6db..18b6061cd6 100644
--- a/engines/wintermute/Base/BFrame.h
+++ b/engines/wintermute/Base/BFrame.h
@@ -62,7 +62,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/BGame.h b/engines/wintermute/Base/BGame.h
index b67a440415..00cb8c16cf 100644
--- a/engines/wintermute/Base/BGame.h
+++ b/engines/wintermute/Base/BGame.h
@@ -226,7 +226,7 @@ public:
 	virtual HRESULT ExternalCall(CScScript *script, CScStack *stack, CScStack *thisStack, char *name);

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

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

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

 	virtual const char *scToString();

 	// compatibility bits

diff --git a/engines/wintermute/Base/BKeyboardState.cpp b/engines/wintermute/Base/BKeyboardState.cpp
index 490bf541fe..ce5f5cf8ce 100644
--- a/engines/wintermute/Base/BKeyboardState.cpp
+++ b/engines/wintermute/Base/BKeyboardState.cpp
@@ -173,18 +173,18 @@ CScValue *CBKeyboardState::scGetProperty(const char *name) {
 

 

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

-HRESULT CBKeyboardState::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBKeyboardState::scSetProperty(const char *name, CScValue *value) {

 	/*

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

 	// Name

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

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

-	    setName(Value->GetString());

+	    setName(value->GetString());

 	    if (_renderer) SetWindowText(_renderer->_window, _name);

 	    return S_OK;

 	}

 

-	else*/ return CBScriptable::scSetProperty(name, Value);

+	else*/ return CBScriptable::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/BKeyboardState.h b/engines/wintermute/Base/BKeyboardState.h
index 27aeac6ad9..982dc2998f 100644
--- a/engines/wintermute/Base/BKeyboardState.h
+++ b/engines/wintermute/Base/BKeyboardState.h
@@ -60,7 +60,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp
index 2665d25c97..edab7aa0d2 100644
--- a/engines/wintermute/Base/BObject.cpp
+++ b/engines/wintermute/Base/BObject.cpp
@@ -666,12 +666,12 @@ CScValue *CBObject::scGetProperty(const char *name) {
 

 

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

-HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBObject::scSetProperty(const char *name, CScValue *value) {

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

 	// Caption

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

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

-		setCaption(Value->GetString());

+		setCaption(value->GetString());

 		return S_OK;

 	}

 

@@ -679,7 +679,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// X

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

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

-		_posX = Value->GetInt();

+		_posX = value->GetInt();

 		afterMove();

 		return S_OK;

 	}

@@ -688,7 +688,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Y

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

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

-		_posY = Value->GetInt();

+		_posY = value->GetInt();

 		afterMove();

 		return S_OK;

 	}

@@ -697,7 +697,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Movable

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

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

-		_movable = Value->GetBool();

+		_movable = value->GetBool();

 		return S_OK;

 	}

 

@@ -705,7 +705,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Registrable/Interactive

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

 	else if (strcmp(name, "Registrable") == 0 || strcmp(name, "Interactive") == 0) {

-		_registrable = Value->GetBool();

+		_registrable = value->GetBool();

 		return S_OK;

 	}

 

@@ -713,7 +713,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Zoomable/Scalable

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

 	else if (strcmp(name, "Zoomable") == 0 || strcmp(name, "Scalable") == 0) {

-		_zoomable = Value->GetBool();

+		_zoomable = value->GetBool();

 		return S_OK;

 	}

 

@@ -721,7 +721,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Rotatable

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

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

-		_rotatable = Value->GetBool();

+		_rotatable = value->GetBool();

 		return S_OK;

 	}

 

@@ -729,7 +729,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// AlphaColor

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

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

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

+		_alphaColor = (uint32)value->GetInt();

 		return S_OK;

 	}

 

@@ -737,7 +737,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// BlendMode

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

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

-		int i = Value->GetInt();

+		int i = value->GetInt();

 		if (i < BLEND_NORMAL || i >= NUM_BLEND_MODES) i = BLEND_NORMAL;

 		_blendMode = (TSpriteBlendMode)i;

 		return S_OK;

@@ -747,8 +747,8 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Scale

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

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

-		if (Value->IsNULL()) _scale = -1;

-		else _scale = (float)Value->GetFloat();

+		if (value->IsNULL()) _scale = -1;

+		else _scale = (float)value->GetFloat();

 		return S_OK;

 	}

 

@@ -756,8 +756,8 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// ScaleX

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

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

-		if (Value->IsNULL()) _scaleX = -1;

-		else _scaleX = (float)Value->GetFloat();

+		if (value->IsNULL()) _scaleX = -1;

+		else _scaleX = (float)value->GetFloat();

 		return S_OK;

 	}

 

@@ -765,8 +765,8 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// ScaleY

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

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

-		if (Value->IsNULL()) _scaleY = -1;

-		else _scaleY = (float)Value->GetFloat();

+		if (value->IsNULL()) _scaleY = -1;

+		else _scaleY = (float)value->GetFloat();

 		return S_OK;

 	}

 

@@ -774,7 +774,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// RelativeScale

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

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

-		_relativeScale = (float)Value->GetFloat();

+		_relativeScale = (float)value->GetFloat();

 		return S_OK;

 	}

 

@@ -782,11 +782,11 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Rotate

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

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

-		if (Value->IsNULL()) {

+		if (value->IsNULL()) {

 			_rotate = 0.0f;

 			_rotateValid = false;

 		} else {

-			_rotate = (float)Value->GetFloat();

+			_rotate = (float)value->GetFloat();

 			_rotateValid = true;

 		}

 		return S_OK;

@@ -796,7 +796,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// RelativeRotate

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

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

-		_relativeRotate = (float)Value->GetFloat();

+		_relativeRotate = (float)value->GetFloat();

 		return S_OK;

 	}

 

@@ -804,7 +804,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// Colorable

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

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

-		_shadowable = Value->GetBool();

+		_shadowable = value->GetBool();

 		return S_OK;

 	}

 

@@ -812,7 +812,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// SoundPanning

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

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

-		_autoSoundPanning = Value->GetBool();

+		_autoSoundPanning = value->GetBool();

 		if (!_autoSoundPanning) resetSoundPan();

 		return S_OK;

 	}

@@ -821,7 +821,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// SaveState

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

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

-		_saveState = Value->GetBool();

+		_saveState = value->GetBool();

 		return S_OK;

 	}

 

@@ -829,7 +829,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 	// NonIntMouseEvents

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

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

-		_nonIntMouseEvents = Value->GetBool();

+		_nonIntMouseEvents = value->GetBool();

 		return S_OK;

 	}

 

@@ -840,7 +840,7 @@ HRESULT CBObject::scSetProperty(const char *name, CScValue *Value) {
 		return S_OK;

 	}

 

-	else return CBScriptHolder::scSetProperty(name, Value);

+	else return CBScriptHolder::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/BObject.h b/engines/wintermute/Base/BObject.h
index 44bb8c86ca..b217994ada 100644
--- a/engines/wintermute/Base/BObject.h
+++ b/engines/wintermute/Base/BObject.h
@@ -134,7 +134,7 @@ public:
 public:

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index d85dfaaa2f..0a3c9ce9f5 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -350,12 +350,12 @@ CScValue *CBRegion::scGetProperty(const char *name) {
 

 

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

-HRESULT CBRegion::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBRegion::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

 	}

 

@@ -363,11 +363,11 @@ HRESULT CBRegion::scSetProperty(const char *name, CScValue *Value) {
 	// Active

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

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

-		_active = Value->GetBool();

+		_active = value->GetBool();

 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Base/BRegion.h b/engines/wintermute/Base/BRegion.h
index e4050c8ede..e63ae3a170 100644
--- a/engines/wintermute/Base/BRegion.h
+++ b/engines/wintermute/Base/BRegion.h
@@ -58,7 +58,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp
index 9d2c39e3cb..e68716cbab 100644
--- a/engines/wintermute/Base/BScriptHolder.cpp
+++ b/engines/wintermute/Base/BScriptHolder.cpp
@@ -240,14 +240,14 @@ CScValue *CBScriptHolder::scGetProperty(const char *name) {
 

 

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

-HRESULT CBScriptHolder::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBScriptHolder::scSetProperty(const char *name, CScValue *value) {

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

 	// Name

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

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

-		setName(Value->GetString());

+		setName(value->GetString());

 		return S_OK;

-	} else return CBScriptable::scSetProperty(name, Value);

+	} else return CBScriptable::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 89acae9b55..257a71f255 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -704,12 +704,12 @@ CScValue *CBSprite::scGetProperty(const char *name) {
 

 

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

-HRESULT CBSprite::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBSprite::scSetProperty(const char *name, CScValue *value) {

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

 	// CurrentFrame

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

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

-		_currentFrame = Value->GetInt(0);

+		_currentFrame = value->GetInt(0);

 		if (_currentFrame >= _frames.GetSize() || _currentFrame < 0) {

 			_currentFrame = -1;

 		}

@@ -721,7 +721,7 @@ HRESULT CBSprite::scSetProperty(const char *name, CScValue *Value) {
 	// PixelPerfect

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

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

-		_precise = Value->GetBool();

+		_precise = value->GetBool();

 		return S_OK;

 	}

 

@@ -729,11 +729,11 @@ HRESULT CBSprite::scSetProperty(const char *name, CScValue *Value) {
 	// Looping

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

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

-		_looping = Value->GetBool();

+		_looping = value->GetBool();

 		return S_OK;

 	}

 

-	else return CBScriptHolder::scSetProperty(name, Value);

+	else return CBScriptHolder::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/Base/BSprite.h
index 88bc8dbe2f..f65ed130c2 100644
--- a/engines/wintermute/Base/BSprite.h
+++ b/engines/wintermute/Base/BSprite.h
@@ -80,7 +80,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index 89ca0c858b..341dcbbdd5 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -473,12 +473,12 @@ CScValue *CBSubFrame::scGetProperty(const char *name) {
 

 

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

-HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *value) {

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

 	// AlphaColor

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

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

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

+		_alpha = (uint32)value->GetInt();

 		return S_OK;

 	}

 

@@ -486,7 +486,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// Is2DOnly

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

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

-		_2DOnly = Value->GetBool();

+		_2DOnly = value->GetBool();

 		return S_OK;

 	}

 

@@ -494,7 +494,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// Is3DOnly

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

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

-		_3DOnly = Value->GetBool();

+		_3DOnly = value->GetBool();

 		return S_OK;

 	}

 

@@ -502,7 +502,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// MirrorX

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

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

-		_mirrorX = Value->GetBool();

+		_mirrorX = value->GetBool();

 		return S_OK;

 	}

 

@@ -510,7 +510,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// MirrorY

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

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

-		_mirrorY = Value->GetBool();

+		_mirrorY = value->GetBool();

 		return S_OK;

 	}

 

@@ -518,7 +518,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// Decoration

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

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

-		_decoration = Value->GetBool();

+		_decoration = value->GetBool();

 		return S_OK;

 	}

 

@@ -526,7 +526,7 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// HotspotX

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

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

-		_hotspotX = Value->GetInt();

+		_hotspotX = value->GetInt();

 		return S_OK;

 	}

 

@@ -534,11 +534,11 @@ HRESULT CBSubFrame::scSetProperty(const char *name, CScValue *Value) {
 	// HotspotY

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

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

-		_hotspotY = Value->GetInt();

+		_hotspotY = value->GetInt();

 		return S_OK;

 	}

 

-	else return CBScriptable::scSetProperty(name, Value);

+	else return CBScriptable::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/BSubFrame.h b/engines/wintermute/Base/BSubFrame.h
index 5d4547f722..25fce16159 100644
--- a/engines/wintermute/Base/BSubFrame.h
+++ b/engines/wintermute/Base/BSubFrame.h
@@ -75,7 +75,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index 68b919bbe5..1c69f0ed3a 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -834,33 +834,33 @@ CScValue *CPartEmitter::scGetProperty(const char *name) {
 

 

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

-HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *value) {

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

 	// X

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

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

-		_posX = Value->GetInt();

+		_posX = value->GetInt();

 		return S_OK;

 	}

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

 	// Y

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

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

-		_posY = Value->GetInt();

+		_posY = value->GetInt();

 		return S_OK;

 	}

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

 	// Width

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

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

-		_width = Value->GetInt();

+		_width = value->GetInt();

 		return S_OK;

 	}

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

 	// Height

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

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

-		_height = Value->GetInt();

+		_height = value->GetInt();

 		return S_OK;

 	}

 

@@ -868,21 +868,21 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Scale1

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

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

-		_scale1 = Value->GetFloat();

+		_scale1 = value->GetFloat();

 		return S_OK;

 	}

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

 	// Scale2

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

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

-		_scale2 = Value->GetFloat();

+		_scale2 = value->GetFloat();

 		return S_OK;

 	}

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

 	// ScaleZBased

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

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

-		_scaleZBased = Value->GetBool();

+		_scaleZBased = value->GetBool();

 		return S_OK;

 	}

 

@@ -890,21 +890,21 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Velocity1

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

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

-		_velocity1 = Value->GetFloat();

+		_velocity1 = value->GetFloat();

 		return S_OK;

 	}

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

 	// Velocity2

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

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

-		_velocity2 = Value->GetFloat();

+		_velocity2 = value->GetFloat();

 		return S_OK;

 	}

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

 	// VelocityZBased

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

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

-		_velocityZBased = Value->GetBool();

+		_velocityZBased = value->GetBool();

 		return S_OK;

 	}

 

@@ -912,21 +912,21 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// LifeTime1

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

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

-		_lifeTime1 = Value->GetInt();

+		_lifeTime1 = value->GetInt();

 		return S_OK;

 	}

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

 	// LifeTime2

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

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

-		_lifeTime2 = Value->GetInt();

+		_lifeTime2 = value->GetInt();

 		return S_OK;

 	}

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

 	// LifeTimeZBased

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

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

-		_lifeTimeZBased = Value->GetBool();

+		_lifeTimeZBased = value->GetBool();

 		return S_OK;

 	}

 

@@ -934,14 +934,14 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Angle1

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

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

-		_angle1 = Value->GetInt();

+		_angle1 = value->GetInt();

 		return S_OK;

 	}

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

 	// Angle2

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

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

-		_angle2 = Value->GetInt();

+		_angle2 = value->GetInt();

 		return S_OK;

 	}

 

@@ -949,14 +949,14 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// AngVelocity1

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

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

-		_angVelocity1 = Value->GetFloat();

+		_angVelocity1 = value->GetFloat();

 		return S_OK;

 	}

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

 	// AngVelocity2

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

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

-		_angVelocity2 = Value->GetFloat();

+		_angVelocity2 = value->GetFloat();

 		return S_OK;

 	}

 

@@ -964,14 +964,14 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Rotation1

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

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

-		_rotation1 = Value->GetFloat();

+		_rotation1 = value->GetFloat();

 		return S_OK;

 	}

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

 	// Rotation2

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

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

-		_rotation2 = Value->GetFloat();

+		_rotation2 = value->GetFloat();

 		return S_OK;

 	}

 

@@ -979,7 +979,7 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Alpha1

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

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

-		_alpha1 = Value->GetInt();

+		_alpha1 = value->GetInt();

 		if (_alpha1 < 0) _alpha1 = 0;

 		if (_alpha1 > 255) _alpha1 = 255;

 		return S_OK;

@@ -988,7 +988,7 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// Alpha2

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

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

-		_alpha2 = Value->GetInt();

+		_alpha2 = value->GetInt();

 		if (_alpha2 < 0) _alpha2 = 0;

 		if (_alpha2 > 255) _alpha2 = 255;

 		return S_OK;

@@ -997,7 +997,7 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// AlphaTimeBased

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

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

-		_alphaTimeBased = Value->GetBool();

+		_alphaTimeBased = value->GetBool();

 		return S_OK;

 	}

 

@@ -1005,7 +1005,7 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// MaxParticles

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

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

-		_maxParticles = Value->GetInt();

+		_maxParticles = value->GetInt();

 		return S_OK;

 	}

 

@@ -1013,21 +1013,21 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// GenerationInterval

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

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

-		_genInterval = Value->GetInt();

+		_genInterval = value->GetInt();

 		return S_OK;

 	}

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

 	// GenerationAmount

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

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

-		_genAmount = Value->GetInt();

+		_genAmount = value->GetInt();

 		return S_OK;

 	}

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

 	// MaxBatches

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

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

-		_maxBatches = Value->GetInt();

+		_maxBatches = value->GetInt();

 		return S_OK;

 	}

 

@@ -1035,14 +1035,14 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// FadeInTime

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

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

-		_fadeInTime = Value->GetInt();

+		_fadeInTime = value->GetInt();

 		return S_OK;

 	}

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

 	// FadeOutTime

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

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

-		_fadeOutTime = Value->GetInt();

+		_fadeOutTime = value->GetInt();

 		return S_OK;

 	}

 

@@ -1050,21 +1050,21 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// GrowthRate1

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

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

-		_growthRate1 = Value->GetFloat();

+		_growthRate1 = value->GetFloat();

 		return S_OK;

 	}

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

 	// GrowthRate2

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

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

-		_growthRate2 = Value->GetFloat();

+		_growthRate2 = value->GetFloat();

 		return S_OK;

 	}

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

 	// ExponentialGrowth

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

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

-		_exponentialGrowth = Value->GetBool();

+		_exponentialGrowth = value->GetBool();

 		return S_OK;

 	}

 

@@ -1072,7 +1072,7 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	// UseRegion

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

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

-		_useRegion = Value->GetBool();

+		_useRegion = value->GetBool();

 		return S_OK;

 	}

 

@@ -1082,11 +1082,11 @@ HRESULT CPartEmitter::scSetProperty(const char *name, CScValue *Value) {
 	else if (strcmp(name, "EmitEvent") == 0) {

 		delete[] _emitEvent;

 		_emitEvent = NULL;

-		if (!Value->IsNULL()) CBUtils::SetString(&_emitEvent, Value->GetString());

+		if (!value->IsNULL()) CBUtils::SetString(&_emitEvent, value->GetString());

 		return S_OK;

 	}

 

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

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

 }

 

 

diff --git a/engines/wintermute/Base/PartEmitter.h b/engines/wintermute/Base/PartEmitter.h
index b4e751be8f..7464173eb3 100644
--- a/engines/wintermute/Base/PartEmitter.h
+++ b/engines/wintermute/Base/PartEmitter.h
@@ -119,7 +119,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/Base/scriptables/SXArray.cpp b/engines/wintermute/Base/scriptables/SXArray.cpp
index 5cabe598a5..1a8dfdba64 100644
--- a/engines/wintermute/Base/scriptables/SXArray.cpp
+++ b/engines/wintermute/Base/scriptables/SXArray.cpp
@@ -166,13 +166,13 @@ CScValue *CSXArray::scGetProperty(const char *name) {
 

 

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

-HRESULT CSXArray::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CSXArray::scSetProperty(const char *name, CScValue *value) {

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

 	// Length

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

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

 		int OrigLength = _length;

-		_length = MAX(Value->GetInt(0), 0);

+		_length = MAX(value->GetInt(0), 0);

 

 		char PropName[20];

 		if (_length < OrigLength) {

@@ -192,7 +192,7 @@ HRESULT CSXArray::scSetProperty(const char *name, CScValue *Value) {
 		if (ValidNumber(name, ParamName)) {

 			int Index = atoi(ParamName);

 			if (Index >= _length) _length = Index + 1;

-			return _values->SetProp(ParamName, Value);

+			return _values->SetProp(ParamName, value);

 		} else return E_FAIL;

 	}

 }

diff --git a/engines/wintermute/Base/scriptables/SXArray.h b/engines/wintermute/Base/scriptables/SXArray.h
index 51e0a0047c..deb52bd86a 100644
--- a/engines/wintermute/Base/scriptables/SXArray.h
+++ b/engines/wintermute/Base/scriptables/SXArray.h
@@ -42,7 +42,7 @@ public:
 	CSXArray(CBGame *inGame);

 	virtual ~CSXArray();

 	CScValue *scGetProperty(const char *name);

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

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

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

 	const char *scToString();

 	int _length;

diff --git a/engines/wintermute/Base/scriptables/SXDate.cpp b/engines/wintermute/Base/scriptables/SXDate.cpp
index 039a9abe0a..5026ebdd8e 100644
--- a/engines/wintermute/Base/scriptables/SXDate.cpp
+++ b/engines/wintermute/Base/scriptables/SXDate.cpp
@@ -223,13 +223,13 @@ CScValue *CSXDate::scGetProperty(const char *name) {
 

 

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

-HRESULT CSXDate::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CSXDate::scSetProperty(const char *name, CScValue *value) {

 	/*

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

 	// Name

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

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

-	    setName(Value->GetString());

+	    setName(value->GetString());

 	    return S_OK;

 	}

 

diff --git a/engines/wintermute/Base/scriptables/SXDate.h b/engines/wintermute/Base/scriptables/SXDate.h
index 7d658ea826..72e91e6136 100644
--- a/engines/wintermute/Base/scriptables/SXDate.h
+++ b/engines/wintermute/Base/scriptables/SXDate.h
@@ -41,7 +41,7 @@ public:
 	CSXDate(CBGame *inGame, CScStack *Stack);

 	virtual ~CSXDate();

 	CScValue *scGetProperty(const char *name);

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

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

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

 	const char *scToString();

 	char *_string;

diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index b7eb794e81..b897ca9701 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -641,14 +641,14 @@ CScValue *CSXFile::scGetProperty(const char *name) {
 

 

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

-HRESULT CSXFile::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CSXFile::scSetProperty(const char *name, CScValue *value) {

 	/*

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

 	// Length

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

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

 	    int OrigLength = _length;

-	    _length = max(Value->GetInt(0), 0);

+	    _length = max(value->GetInt(0), 0);

 

 	    char PropName[20];

 	    if(_length < OrigLength){

@@ -659,7 +659,7 @@ HRESULT CSXFile::scSetProperty(const char *name, CScValue *Value) {
 	    }

 	    return S_OK;

 	}

-	else*/ return CBScriptable::scSetProperty(name, Value);

+	else*/ return CBScriptable::scSetProperty(name, value);

 }

 

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

diff --git a/engines/wintermute/Base/scriptables/SXFile.h b/engines/wintermute/Base/scriptables/SXFile.h
index 39c7f7b954..b28fca019e 100644
--- a/engines/wintermute/Base/scriptables/SXFile.h
+++ b/engines/wintermute/Base/scriptables/SXFile.h
@@ -41,7 +41,7 @@ class CSXFile : public CBScriptable {
 public:

 	DECLARE_PERSISTENT(CSXFile, CBScriptable)

 	CScValue *scGetProperty(const char *name);

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

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

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

 	const char *scToString();

 	CSXFile(CBGame *inGame, CScStack *Stack);

diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
index f65f800a4e..82a9a1f5e2 100644
--- a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
@@ -431,14 +431,14 @@ CScValue *CSXMemBuffer::scGetProperty(const char *name) {
 

 

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

-HRESULT CSXMemBuffer::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CSXMemBuffer::scSetProperty(const char *name, CScValue *value) {

 	/*

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

 	// Length

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

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

 	    int OrigLength = _length;

-	    _length = max(Value->GetInt(0), 0);

+	    _length = max(value->GetInt(0), 0);

 

 	    char PropName[20];

 	    if(_length < OrigLength){

@@ -449,7 +449,7 @@ HRESULT CSXMemBuffer::scSetProperty(const char *name, CScValue *Value) {
 	    }

 	    return S_OK;

 	}

-	else*/ return CBScriptable::scSetProperty(name, Value);

+	else*/ return CBScriptable::scSetProperty(name, value);

 }

 

 

diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.h b/engines/wintermute/Base/scriptables/SXMemBuffer.h
index ba62162cc4..13b98b589d 100644
--- a/engines/wintermute/Base/scriptables/SXMemBuffer.h
+++ b/engines/wintermute/Base/scriptables/SXMemBuffer.h
@@ -39,7 +39,7 @@ public:
 	virtual int scCompare(CBScriptable *Val);

 	DECLARE_PERSISTENT(CSXMemBuffer, CBScriptable)

 	CScValue *scGetProperty(const char *name);

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

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

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

 	const char *scToString();

 	CSXMemBuffer(CBGame *inGame, CScStack *Stack);

diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp
index 4db6ad413c..4a912df5fe 100644
--- a/engines/wintermute/Base/scriptables/SXString.cpp
+++ b/engines/wintermute/Base/scriptables/SXString.cpp
@@ -352,12 +352,12 @@ CScValue *CSXString::scGetProperty(const char *name) {
 

 

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

-HRESULT CSXString::scSetProperty(const char *name, CScValue *Value) {

+HRESULT CSXString::scSetProperty(const char *name, CScValue *value) {

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

 	// Capacity

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

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

-		int NewCap = Value->GetInt();

+		int NewCap = value->GetInt();

 		if (NewCap < strlen(_string) + 1) Game->LOG(0, "Warning: cannot lower string capacity");

 		else if (NewCap != _capacity) {

 			char *NewStr = new char[NewCap];

diff --git a/engines/wintermute/Base/scriptables/SXString.h b/engines/wintermute/Base/scriptables/SXString.h
index 5f662c3289..93bae35616 100644
--- a/engines/wintermute/Base/scriptables/SXString.h
+++ b/engines/wintermute/Base/scriptables/SXString.h
@@ -39,7 +39,7 @@ public:
 	virtual int scCompare(CBScriptable *Val);

 	DECLARE_PERSISTENT(CSXString, CBScriptable)

 	CScValue *scGetProperty(const char *name);

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

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

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

 	void scSetString(const char *Val);

 	const char *scToString();

diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp
index 8dac129788..f10aa7085b 100644
--- a/engines/wintermute/Base/scriptables/ScStack.cpp
+++ b/engines/wintermute/Base/scriptables/ScStack.cpp
@@ -66,16 +66,16 @@ CScValue *CScStack::Pop() {
 

 

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

-void CScStack::Push(CScValue *Val) {

+void CScStack::Push(CScValue *val) {

 	_sP++;

 

 	if (_sP < _values.GetSize()) {

 		_values[_sP]->cleanup();

-		_values[_sP]->Copy(Val);

+		_values[_sP]->Copy(val);

 	} else {

-		CScValue *val = new CScValue(Game);

-		val->Copy(Val);

-		_values.Add(val);

+		CScValue *copyVal = new CScValue(Game);

+		copyVal->Copy(val);

+		_values.Add(copyVal);

 	}

 }

 

@@ -102,10 +102,10 @@ CScValue *CScStack::GetTop() {
 

 

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

-CScValue *CScStack::GetAt(int Index) {

-	Index = _sP - Index;

-	if (Index < 0 || Index >= _values.GetSize()) return NULL;

-	else return _values[Index];

+CScValue *CScStack::GetAt(int index) {

+	index = _sP - index;

+	if (index < 0 || index >= _values.GetSize()) return NULL;

+	else return _values[index];

 }

 

 

@@ -152,55 +152,55 @@ void CScStack::PushNULL() {
 

 

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

-void CScStack::PushInt(int Val) {

+void CScStack::PushInt(int val) {

 	/*

 	CScValue* val = new CScValue(Game);

 	val->SetInt(Val);

 	Push(val);

 	delete val;

 	*/

-	GetPushValue()->SetInt(Val);

+	GetPushValue()->SetInt(val);

 }

 

 

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

-void CScStack::PushFloat(double Val) {

+void CScStack::PushFloat(double val) {

 	/*

 	CScValue* val = new CScValue(Game);

 	val->SetFloat(Val);

 	Push(val);

 	delete val;

 	*/

-	GetPushValue()->SetFloat(Val);

+	GetPushValue()->SetFloat(val);

 }

 

 

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

-void CScStack::PushBool(bool Val) {

+void CScStack::PushBool(bool val) {

 	/*

 	CScValue* val = new CScValue(Game);

 	val->SetBool(Val);

 	Push(val);

 	delete val;

 	*/

-	GetPushValue()->SetBool(Val);

+	GetPushValue()->SetBool(val);

 }

 

 

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

-void CScStack::PushString(const char *Val) {

+void CScStack::PushString(const char *val) {

 	/*

 	CScValue* val = new CScValue(Game);

 	val->SetString(Val);

 	Push(val);

 	delete val;

 	*/

-	GetPushValue()->SetString(Val);

+	GetPushValue()->SetString(val);

 }

 

 

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

-void CScStack::PushNative(CBScriptable *Val, bool Persistent) {

+void CScStack::PushNative(CBScriptable *val, bool persistent) {

 	/*

 	CScValue* val = new CScValue(Game);

 	val->SetNative(Val, Persistent);

@@ -208,7 +208,7 @@ void CScStack::PushNative(CBScriptable *Val, bool Persistent) {
 	delete val;

 	*/

 

-	GetPushValue()->SetNative(Val, Persistent);

+	GetPushValue()->SetNative(val, persistent);

 }

 

 

diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp
index 8409de7b96..aede849ecc 100644
--- a/engines/wintermute/Base/scriptables/ScValue.cpp
+++ b/engines/wintermute/Base/scriptables/ScValue.cpp
@@ -872,43 +872,43 @@ HRESULT CScValue::DbgSendVariables(IWmeDebugClient *Client, EWmeDebuggerVariable
 

 

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

-bool CScValue::SetProperty(const char *PropName, int Value) {

-	CScValue *Val = new CScValue(Game, Value);

-	bool Ret =  SUCCEEDED(SetProp(PropName, Val));

+bool CScValue::SetProperty(const char *propName, int value) {

+	CScValue *Val = new CScValue(Game, value);

+	bool Ret =  SUCCEEDED(SetProp(propName, Val));

 	delete Val;

 	return Ret;

 }

 

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

-bool CScValue::SetProperty(const char *PropName, const char *Value) {

-	CScValue *Val = new CScValue(Game, Value);

-	bool Ret =  SUCCEEDED(SetProp(PropName, Val));

+bool CScValue::SetProperty(const char *propName, const char *value) {

+	CScValue *Val = new CScValue(Game, value);

+	bool Ret =  SUCCEEDED(SetProp(propName, Val));

 	delete Val;

 	return Ret;

 }

 

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

-bool CScValue::SetProperty(const char *PropName, double Value) {

-	CScValue *Val = new CScValue(Game, Value);

-	bool Ret =  SUCCEEDED(SetProp(PropName, Val));

+bool CScValue::SetProperty(const char *propName, double value) {

+	CScValue *Val = new CScValue(Game, value);

+	bool Ret =  SUCCEEDED(SetProp(propName, Val));

 	delete Val;

 	return Ret;

 }

 

 

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

-bool CScValue::SetProperty(const char *PropName, bool Value) {

-	CScValue *Val = new CScValue(Game, Value);

-	bool Ret =  SUCCEEDED(SetProp(PropName, Val));

+bool CScValue::SetProperty(const char *propName, bool value) {

+	CScValue *Val = new CScValue(Game, value);

+	bool Ret =  SUCCEEDED(SetProp(propName, Val));

 	delete Val;

 	return Ret;

 }

 

 

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

-bool CScValue::SetProperty(const char *PropName) {

+bool CScValue::SetProperty(const char *propName) {

 	CScValue *Val = new CScValue(Game);

-	bool Ret =  SUCCEEDED(SetProp(PropName, Val));

+	bool Ret =  SUCCEEDED(SetProp(propName, Val));

 	delete Val;

 	return Ret;

 }

@@ -1001,19 +1001,19 @@ int CScValue::DbgGetNumProperties() {
 }

 

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

-bool CScValue::DbgGetProperty(int Index, const char **Name, IWmeDebugProp **Value) {

-	if (_valNative && _valNative->_scProp) return _valNative->_scProp->DbgGetProperty(Index, Name, Value);

+bool CScValue::DbgGetProperty(int index, const char **name, IWmeDebugProp **value) {

+	if (_valNative && _valNative->_scProp) return _valNative->_scProp->DbgGetProperty(index, name, value);

 	else {

-		int Count = 0;

+		int count = 0;

 		_valIter = _valObject.begin();

 		while (_valIter != _valObject.end()) {

-			if (Count == Index) {

-				*Name = _valIter->_key.c_str();

-				*Value = _valIter->_value;

+			if (count == index) {

+				*name = _valIter->_key.c_str();

+				*value = _valIter->_value;

 				return true;

 			}

 			_valIter++;

-			Count++;

+			count++;

 		}

 		return false;

 	}

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index ea20e29490..9829114d3a 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -967,12 +967,12 @@ CScValue *CUIButton::scGetProperty(const char *name) {
 

 

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

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

+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,25 +982,25 @@ 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;

 	}

 

-	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 07bc18bc65..e89c37aa0c 100644
--- a/engines/wintermute/UI/UIButton.h
+++ b/engines/wintermute/UI/UIButton.h
@@ -69,7 +69,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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 4678f81d9a..f0d4d62874 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -457,12 +457,12 @@ CScValue *CUIEdit::scGetProperty(const char *name) {
 

 

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

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

+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,15 +515,15 @@ 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;

 	}

 

-	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 8477e6f9d5..2ee2d3ea3a 100644
--- a/engines/wintermute/UI/UIEdit.h
+++ b/engines/wintermute/UI/UIEdit.h
@@ -62,7 +62,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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 afba22cc49..2db966f89d 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -310,14 +310,14 @@ CScValue *CUIEntity::scGetProperty(const char *name) {
 

 

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

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

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

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

 }

 

 

diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h
index 55c5790ef5..670973fdeb 100644
--- a/engines/wintermute/UI/UIEntity.h
+++ b/engines/wintermute/UI/UIEntity.h
@@ -48,7 +48,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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 c23415287c..45037ec490 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -418,12 +418,12 @@ CScValue *CUIObject::scGetProperty(const char *name) {
 

 

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

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

+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,11 +471,11 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) {
 	// Text

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

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

-		setText(Value->GetString());

+		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 bc49c01a2f..f1ebd81f8c 100644
--- a/engines/wintermute/UI/UIObject.h
+++ b/engines/wintermute/UI/UIObject.h
@@ -73,7 +73,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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 e5b89e15df..e73006c28d 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -434,12 +434,12 @@ CScValue *CUIText::scGetProperty(const char *name) {
 

 

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

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

+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,13 +449,13 @@ 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;

 	}

 

-	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 bb0b6a4d84..1f5029e4a6 100644
--- a/engines/wintermute/UI/UIText.h
+++ b/engines/wintermute/UI/UIText.h
@@ -49,7 +49,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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 4e0590ab15..26c60702cb 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -1005,12 +1005,12 @@ CScValue *CUIWindow::scGetProperty(const char *name) {
 

 

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

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

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

@@ -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 e22a09027d..80dcda9333 100644
--- a/engines/wintermute/UI/UIWindow.h
+++ b/engines/wintermute/UI/UIWindow.h
@@ -83,7 +83,7 @@ public:
 

 	// scripting interface

 	virtual CScValue *scGetProperty(const char *name);

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

+	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/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 845c2e21c6..2f66313bb0 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -120,11 +120,11 @@ void CBUtils::DebugMessage(HWND hWnd, const char *Text) {
 

 

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

-char *CBUtils::SetString(char **String, const char *Value) {

-	delete[] *String;

-	*String = new char[strlen(Value) + 1];

-	if (*String) strcpy(*String, Value);

-	return *String;

+char *CBUtils::SetString(char **string, const char *value) {

+	delete[] *string;

+	*string = new char[strlen(value) + 1];

+	if (*string) strcpy(*string, value);

+	return *string;

 }

 

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