[Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.3,1.4 mouse.cpp,1.3,1.4 resman.cpp,1.3,1.4 sound.cpp,1.2,1.3 speech.cpp,1.3,1.4 startup.cpp,1.2,1.3 sword2.cpp,1.3,1.4

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv18270/bs2

Modified Files:
	build_display.cpp mouse.cpp resman.cpp sound.cpp speech.cpp 
	startup.cpp sword2.cpp 
Log Message:

A few warnings


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- build_display.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ build_display.cpp	28 Jul 2003 03:49:25 -0000	1.4
@@ -358,7 +358,7 @@
 		while(GetFadeStatus()==RDFADE_DOWN);
 	}
 
-	Set_mouse(NULL);
+	Set_mouse(0);
 	Set_luggage(0);	//tw28Aug
 
 	EraseBackBuffer();				// for hardware rendering

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mouse.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ mouse.cpp	28 Jul 2003 03:49:25 -0000	1.4
@@ -775,7 +775,7 @@
 	{														// flip to a blank cursor for a cycle
 		mouse_touching=0;			// ignore the new id this cycle - should hit next cycle
 		old_mouse_touching=0;		// we've moved off
-		Set_mouse(NULL);			// blank cursor
+		Set_mouse(0);			// blank cursor
 		mouse_flicked_off=1;		// so we know to set the mouse pointer back to normal if 2nd hot-spot doesn't register because mouse pulled away quickly (onto nothing)
 		
 		// reset luggage only when necessary
@@ -1131,8 +1131,8 @@
 
 	mouse_status=1;	//human/mouse off
 
-	Set_mouse(NULL);			// blank cursor
-	Set_luggage(NULL);			// blank cursor
+	Set_mouse(0);			// blank cursor
+	Set_luggage(0);			// blank cursor
 
 
 //must be normal mouse situation or a largely neutral situation - special menus use No_human
@@ -1163,8 +1163,8 @@
 
 	mouse_status=1;	//human/mouse off
 
-	Set_mouse(NULL);			// blank cursor
-	Set_luggage(NULL);			// blank cursor
+	Set_mouse(0);			// blank cursor
+	Set_luggage(0);			// blank cursor
 }
 //------------------------------------------------------------------------------------
 int32 FN_add_human(int32 *params)	//Tony30Sept96
@@ -1199,7 +1199,7 @@
 		COMBINE_BASE=0;			// - just in case
 
 
-		Set_luggage(NULL);			// blank cursor
+		Set_luggage(0);			// blank cursor
 	}
 
 
@@ -1309,7 +1309,7 @@
 //no params
 
 
-	Set_mouse(NULL);
+	Set_mouse(0);
 
 	if (params);
 

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resman.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ resman.cpp	28 Jul 2003 03:49:25 -0000	1.4
@@ -1091,7 +1091,7 @@
 
 
 
-	Set_mouse(NULL);
+	Set_mouse(0);
 	Set_luggage(0);	//tw28Aug
 
 	uint8 *bgfile;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ sound.cpp	28 Jul 2003 03:49:25 -0000	1.3
@@ -200,7 +200,7 @@
 		Zdebug("SFX (sample=\"%s\", vol=%d, pan=%d, delay=%d, type=%s)", FetchObjectName(params[0]), params[3], params[4], params[2], type);
 	}
 
-	#endif	_DEBUG
+	#endif	//_DEBUG
 	//----------------------------------
 
 	while ((j < FXQ_LENGTH) && (fxq[j].resource != 0))

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- speech.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ speech.cpp	28 Jul 2003 03:49:25 -0000	1.4
@@ -291,7 +291,7 @@
 
 					IN_SUBJECT=0;
 
-					Set_mouse(NULL);	//blank mouse again
+					Set_mouse(0);	//blank mouse again
 
 //					Zdebug("hit %d - ref %d  ref*8 %d", hit, subject_list[hit].ref, subject_list[hit].ref*8);
 

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/startup.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- startup.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ startup.cpp	28 Jul 2003 03:49:25 -0000	1.3
@@ -255,7 +255,7 @@
 
 
 
-	if (*input == NULL)		// so that typing 'S' then <enter> works on NT (James26feb97)
+	if (*input == 0)		// so that typing 'S' then <enter> works on NT (James26feb97)
 	{
 		Con_print_start_menu();
 		return(1);

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sword2.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ sword2.cpp	28 Jul 2003 03:49:25 -0000	1.4
@@ -520,8 +520,8 @@
 //make a normal mouse
 	ClearPointerText();
 //	mouse_mode=MOUSE_normal;
-	SetLuggageAnim(NULL, NULL);	//this is the only place allowed to do it this way
-	Set_mouse(NULL);			// blank cursor
+	SetLuggageAnim(NULL, 0);	//this is the only place allowed to do it this way
+	Set_mouse(0);			// blank cursor
 	mouse_touching=1;	//forces engine to choose a cursor
 
 	if (current_graphics_level==3)	// if level at max