[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv4271/simon

Modified Files:
	simon.cpp 
Log Message:
fixing various warnings that occur with -Wshadow;some other minor cleanup

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- simon.cpp	21 Oct 2002 22:06:06 -0000	1.17
+++ simon.cpp	22 Oct 2002 11:48:24 -0000	1.18
@@ -4419,7 +4419,7 @@
 bool SimonState::save_game(uint slot, const char *caption)
 {
 	File f;
-	uint item_index, num_item, i;
+	uint item_index, num_item, i, j;
 	TimeEvent *te;
 
 	_lock_word |= 0x100;
@@ -4444,8 +4444,8 @@
 	i = 0;
 	for (te = _first_time_struct; te; te = te->next)
 		i++;
-
 	f.writeUint32BE(i);
+
 	for (te = _first_time_struct; te; te = te->next) {
 		f.writeUint32BE(te->time + _base_time);
 		f.writeUint16BE(te->subroutine_id);
@@ -4460,36 +4460,28 @@
 		f.writeUint16BE(item->unk3);
 		f.writeUint16BE(item->unk4);
 
-		{
-			Child1 *child1 = findChildOfType1(item);
-			if (child1) {
-				f.writeUint16BE(child1->fr2);
-			}
+		Child1 *child1 = findChildOfType1(item);
+		if (child1) {
+			f.writeUint16BE(child1->fr2);
 		}
 
-		{
-			Child2 *child2 = findChildOfType2(item);
-			uint i, j;
-
-			if (child2) {
-				f.writeUint32BE(child2->avail_props);
-				i = child2->avail_props & 1;
+		Child2 *child2 = findChildOfType2(item);
+		if (child2) {
+			f.writeUint32BE(child2->avail_props);
+			i = child2->avail_props & 1;
 
-				for (j = 1; j < 16; j++) {
-					if ((1 << j) & child2->avail_props) {
-						f.writeUint16BE(child2->array[i++]);
-					}
+			for (j = 1; j < 16; j++) {
+				if ((1 << j) & child2->avail_props) {
+					f.writeUint16BE(child2->array[i++]);
 				}
 			}
 		}
 
-		{
-			Child9 *child9 = (Child9 *) findChildOfType(item, 9);
-			if (child9) {
-				uint i;
-				for (i = 0; i != 4; i++) {
-					f.writeUint16BE(child9->array[i]);
-				}
+		Child9 *child9 = (Child9 *) findChildOfType(item, 9);
+		if (child9) {
+			uint i;
+			for (i = 0; i != 4; i++) {
+				f.writeUint16BE(child9->array[i]);
 			}
 		}
 	}