WINTERMUTE: Rename VarName->varName in ScStack

2 files changed, 20 insertions, 20 deletions

diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp
index c00f0656e0..498a8472cc 100644
--- a/engines/wintermute/Base/scriptables/ScStack.cpp
+++ b/engines/wintermute/Base/scriptables/ScStack.cpp
@@ -110,24 +110,24 @@ CScValue *CScStack::getAt(int index) {
 

 

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

-void CScStack::correctParams(uint32 expected_params) {

-	int nu_params = pop()->getInt();

+void CScStack::correctParams(uint32 expectedParams) {

+	int nuParams = pop()->getInt();

 

-	if (expected_params < nu_params) { // too many params

-		while (expected_params < nu_params) {

+	if (expectedParams < nuParams) { // too many params

+		while (expectedParams < nuParams) {

 			//Pop();

-			delete _values[_sP - expected_params];

-			_values.RemoveAt(_sP - expected_params);

-			nu_params--;

+			delete _values[_sP - expectedParams];

+			_values.RemoveAt(_sP - expectedParams);

+			nuParams--;

 			_sP--;

 		}

-	} else if (expected_params > nu_params) { // need more params

-		while (expected_params > nu_params) {

+	} else if (expectedParams > nuParams) { // need more params

+		while (expectedParams > nuParams) {

 			//Push(null_val);

-			CScValue *null_val = new CScValue(Game);

-			null_val->setNULL();

-			_values.InsertAt(_sP - nu_params + 1, null_val);

-			nu_params++;

+			CScValue *nullVal = new CScValue(Game);

+			nullVal->setNULL();

+			_values.InsertAt(_sP - nuParams + 1, nullVal);

+			nuParams++;

 			_sP++;

 

 			if (_values.GetSize() > _sP + 1) {

diff --git a/engines/wintermute/Base/scriptables/ScStack.h b/engines/wintermute/Base/scriptables/ScStack.h
index b2d5f15c1c..739f78424a 100644
--- a/engines/wintermute/Base/scriptables/ScStack.h
+++ b/engines/wintermute/Base/scriptables/ScStack.h
@@ -44,15 +44,15 @@ public:
 	CScValue *getAt(int Index);

 	CScValue *getPushValue();

 	DECLARE_PERSISTENT(CScStack, CBBase)

-	void pushNative(CBScriptable *Val, bool Persistent);

-	void pushString(const char *Val);

-	void pushBool(bool Val);

-	void pushInt(int Val);

-	void pushFloat(double Val);

+	void pushNative(CBScriptable *val, bool persistent);

+	void pushString(const char *val);

+	void pushBool(bool val);

+	void pushInt(int val);

+	void pushFloat(double val);

 	void pushNULL();

-	void correctParams(uint32 expected_params);

+	void correctParams(uint32 expectedParams);

 	CScValue *getTop();

-	void push(CScValue *Val);

+	void push(CScValue *val);

 	CScValue *pop();

 	CScStack(CBGame *inGame);

 	virtual ~CScStack();