[Scummvm-cvs-logs] CVS: scummvm/scumm debug.cpp,1.4,1.5 gfx.cpp,1.36,1.37 imuse.cpp,1.66,1.67 script_v2.cpp,1.39,1.40 scummvm.cpp,1.58,1.59 sound.cpp,1.40,1.41

[Max Horn]

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

Modified Files:
	debug.cpp gfx.cpp imuse.cpp script_v2.cpp scummvm.cpp 
	sound.cpp 
Log Message:
fixing various warnings that occur with -Wshadow;some other minor cleanup

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debug.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debug.cpp	17 Sep 2002 04:52:50 -0000	1.4
+++ debug.cpp	22 Oct 2002 11:48:24 -0000	1.5
@@ -201,7 +201,7 @@
 	const DebuggerCommands *dc;
 	char *s;
 	int i;
-	static char *buf;
+	char *buf;
 
 	do {
 #ifndef HAVE_READLINE

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gfx.cpp	20 Oct 2002 12:18:57 -0000	1.36
+++ gfx.cpp	22 Oct 2002 11:48:24 -0000	1.37
@@ -985,8 +985,8 @@
 						decompressMaskImg();
 				} else {
 					if (!(_useOrDecompress && flag & dbAllowMaskOr))
-						for (int h = 0; h < _numLinesToProcess; h++)
-							_mask_ptr_dest[h * NUM_STRIPS] = 0;
+						for (int height = 0; height < _numLinesToProcess; height++)
+							_mask_ptr_dest[height * NUM_STRIPS] = 0;
 					/* needs better abstraction, FIXME */
 				}
 			}

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- imuse.cpp	21 Oct 2002 12:47:06 -0000	1.66
+++ imuse.cpp	22 Oct 2002 11:48:24 -0000	1.67
@@ -5624,8 +5624,8 @@
 	}
 }
 
-void IMuseDigital::pause(bool pause) {
-	_pause = pause;
+void IMuseDigital::pause(bool p) {
+	_pause = p;
 }
 
 int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, int h) {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- script_v2.cpp	20 Oct 2002 16:49:30 -0000	1.39
+++ script_v2.cpp	22 Oct 2002 11:48:24 -0000	1.40
@@ -1345,7 +1345,7 @@
 	if (obj >= NUM_ACTORS) {
 		if (whereIsObject(obj) == WIO_NOT_FOUND)
 			return;
-		int x, y, dir;
+		int y, dir;
 		getObjectXYPos(obj, x, y, dir);
 		a->startWalkActor(x, y, dir);
 	} else {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- scummvm.cpp	19 Oct 2002 22:35:22 -0000	1.58
+++ scummvm.cpp	22 Oct 2002 11:48:24 -0000	1.59
@@ -663,7 +663,7 @@
 		}
 	} else {
 		if (camera._follows) {
-			Actor *a = derefActorSafe(camera._follows, "startScene: follows");
+			a = derefActorSafe(camera._follows, "startScene: follows");
 			setCameraAt(a->x, a->y);
 		}
 	}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- sound.cpp	21 Oct 2002 16:27:23 -0000	1.40
+++ sound.cpp	22 Oct 2002 11:48:24 -0000	1.41
@@ -482,7 +482,7 @@
 
 	if (mode == 1 && (_scumm->_gameId == GID_TENTACLE
 		|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
-		for (int i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
+		for (i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
 			if (i != _talkChannel)
 				_scumm->_mixer->stop(i);
 		}