[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.2,1.3 render.cpp,1.5,1.6

[Jonathan Gray]

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

Modified Files:
	d_sound.cpp render.cpp 
Log Message:
fix some VC7 warnings

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- d_sound.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ d_sound.cpp	28 Jul 2003 11:21:25 -0000	1.3
@@ -2966,7 +2966,7 @@
 
 uint8 GetMusicVolume()
 {
-		return volMusic[0];
+		return (uint8) volMusic[0];
 }
 
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- render.cpp	28 Jul 2003 08:08:42 -0000	1.5
+++ render.cpp	28 Jul 2003 11:21:25 -0000	1.6
@@ -929,8 +929,8 @@
 	}
 	else
 	{
-		scrollx = scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime);
-		scrolly = scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime);
+		scrollx = (int16) (scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime));
+		scrolly = (int16) (scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime));
 		renderTooSlow = 0;
 	}
 
@@ -973,8 +973,8 @@
 	else
 	{
 		*end = FALSE;
-		scrollx = scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime);
-		scrolly = scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime);
+		scrollx = (int16) (scrollxOld + ((scrollxTarget - scrollxOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime));
+		scrolly = (int16) (scrollyOld + ((scrollyTarget - scrollyOld) * (startTime - initialTime + renderAverageTime)) / (totalTime - initialTime));
 	}
 
 	return(RD_OK);