WINTERMUTE: var_name -> varName

3 files changed, 19 insertions, 19 deletions

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 4533496199..e7bc4483e6 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -715,13 +715,13 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		ScValue *val = stack->pop();

 		if (!val->isNULL()) {

 			for (int i = 0; i < _inventories.getSize(); i++) {

-				AdInventory *Inv = _inventories[i];

+				AdInventory *inv = _inventories[i];

 

-				for (int j = 0; j < Inv->_takenItems.getSize(); j++) {

-					if (val->getNative() == Inv->_takenItems[j]) {

+				for (int j = 0; j < inv->_takenItems.getSize(); j++) {

+					if (val->getNative() == inv->_takenItems[j]) {

 						stack->pushBool(true);

 						return STATUS_OK;

-					} else if (scumm_stricmp(val->getString(), Inv->_takenItems[j]->getName()) == 0) {

+					} else if (scumm_stricmp(val->getString(), inv->_takenItems[j]->getName()) == 0) {

 						stack->pushBool(true);

 						return STATUS_OK;

 					}

@@ -1176,16 +1176,16 @@ bool AdGame::scSetProperty(const char *name, ScValue *value) {
 

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

 bool AdGame::ExternalCall(ScScript *script, ScStack *stack, ScStack *thisStack, char *name) {

-	ScValue *this_obj;

+	ScValue *thisObj;

 

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

 	// Actor

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

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

 		stack->correctParams(0);

-		this_obj = thisStack->getTop();

+		thisObj = thisStack->getTop();

 

-		this_obj->setNative(new AdActor(_gameRef));

+		thisObj->setNative(new AdActor(_gameRef));

 		stack->pushNULL();

 	}

 

@@ -1194,9 +1194,9 @@ bool AdGame::ExternalCall(ScScript *script, ScStack *stack, ScStack *thisStack,
 	//////////////////////////////////////////////////////////////////////////

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

 		stack->correctParams(0);

-		this_obj = thisStack->getTop();

+		thisObj = thisStack->getTop();

 

-		this_obj->setNative(new AdEntity(_gameRef));

+		thisObj->setNative(new AdEntity(_gameRef));

 		stack->pushNULL();

 	}

 

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index b8a3f1da22..80929bcb7b 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -223,7 +223,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) {
 	byte *params;

 	int cmd = 2;

 	BaseParser parser(_gameRef);

-	bool always_visible = false;

+	bool alwaysVisible = false;

 

 	_exclusive = false;

 	if (complete) {

@@ -275,7 +275,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_ALWAYS_VISIBLE:

-			parser.scanStr((char *)params, "%b", &always_visible);

+			parser.scanStr((char *)params, "%b", &alwaysVisible);

 			break;

 

 		case TOKEN_SPACING:

@@ -318,7 +318,7 @@ bool AdInventoryBox::loadBuffer(byte *buffer, bool complete) {
 		}

 	}

 

-	_visible = always_visible;

+	_visible = alwaysVisible;

 

 	if (_window) {

 		for (int i = 0; i < _window->_widgets.getSize(); i++) {

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index c566120405..07df0a88ee 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -453,22 +453,22 @@ bool AdResponseBox::display() {
 

 	// shift down if needed

 	if (!_horizontal) {

-		int total_height = 0;

+		int totalHeight = 0;

 		for (i = 0; i < _respButtons.getSize(); i++) {

-			total_height += (_respButtons[i]->_height + _spacing);

+			totalHeight += (_respButtons[i]->_height + _spacing);

 		}

-		total_height -= _spacing;

+		totalHeight -= _spacing;

 

 		switch (_verticalAlign) {

 		case VAL_BOTTOM:

-			if (yyy + total_height < rect.bottom) {

-				yyy = rect.bottom - total_height;

+			if (yyy + totalHeight < rect.bottom) {

+				yyy = rect.bottom - totalHeight;

 			}

 			break;

 

 		case VAL_CENTER:

-			if (yyy + total_height < rect.bottom) {

-				yyy += ((rect.bottom - rect.top) - total_height) / 2;

+			if (yyy + totalHeight < rect.bottom) {

+				yyy += ((rect.bottom - rect.top) - totalHeight) / 2;

 			}

 			break;