[Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.55,1.56 interpreter.cpp,1.33,1.34 router.cpp,1.34,1.35

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv19216

Modified Files:
	controls.cpp interpreter.cpp router.cpp 
Log Message:
Make VC6/EVC happier

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- controls.cpp	19 Dec 2003 16:50:02 -0000	1.55
+++ controls.cpp	20 Dec 2003 01:17:02 -0000	1.56
@@ -1255,6 +1255,7 @@
 			int textWidth;
 			char tmp;
 			int i;
+			int j;
 
 			switch (result) {
 			case kWheelUp:
@@ -1274,7 +1275,7 @@
 					if (widget == _slotButton[i])
 						break;
 
-				for (int j = 0; j < 8; j++) {
+				for (j = 0; j < 8; j++) {
 					if (j != i) {
 						_slotButton[j]->setEditable(false);
 						_slotButton[j]->setState(0);

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- interpreter.cpp	17 Dec 2003 08:01:59 -0000	1.33
+++ interpreter.cpp	20 Dec 2003 01:17:02 -0000	1.34
@@ -301,6 +301,7 @@
 		int caseCount;
 		bool foundCase;
 		int32 ptrval;
+		int i;
 
 		curCommand = code[ip++];
 
@@ -464,7 +465,7 @@
 
 			// Search the cases
 			foundCase = false;
-			for (int i = 0; i < caseCount && !foundCase; i++) {
+			for (i = 0; i < caseCount && !foundCase; i++) {
 				if (value == (int32) READ_LE_UINT32(code + ip)) {
 					// We have found the case, so lets
 					// jump to it

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- router.cpp	17 Dec 2003 08:36:09 -0000	1.34
+++ router.cpp	20 Dec 2003 01:17:02 -0000	1.35
@@ -2469,16 +2469,17 @@
 // called from fnAddWalkGrid
 
 void Router::addWalkGrid(int32 gridResource) {
+	int i;
 	// First, scan the list to see if this grid is already included
 
-	for (int i = 0; i < MAX_WALKGRIDS; i++) {
+	for (i = 0; i < MAX_WALKGRIDS; i++) {
 		if (_walkGridList[i] == gridResource)
 			return;
 	}
 
 	// Scan the list for a free slot
 
-	for (int i = 0; i < MAX_WALKGRIDS; i++) {
+	for (i = 0; i < MAX_WALKGRIDS; i++) {
 		if (_walkGridList[i] == 0) {
 			_walkGridList[i] = gridResource;
 			return;