[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.94,1.95 script_v5.cpp,1.150,1.151 script_v6.cpp,1.178,1.179

[Bertrand Augereau]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2609

Modified Files:
	costume.cpp script_v5.cpp script_v6.cpp 
Log Message:
Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- costume.cpp	12 Aug 2003 05:28:11 -0000	1.94
+++ costume.cpp	13 Aug 2003 23:07:05 -0000	1.95
@@ -719,7 +719,7 @@
 		i++;
 		usemask <<= 1;
 		mask <<= 1;
-	} while ((uint16)mask);
+	} while (mask&0xFFFF);
 }
 
 void CostumeRenderer::setPalette(byte *palette) {

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- script_v5.cpp	13 Aug 2003 22:26:31 -0000	1.150
+++ script_v5.cpp	13 Aug 2003 23:07:05 -0000	1.151
@@ -2680,7 +2680,7 @@
 
 		}
 		if (a) {
-			_switchRoomEffect = (byte)a;
+			_switchRoomEffect = (byte)(a&0xFF);
 			_switchRoomEffect2 = (byte)(a >> 8);
 		} else {
 			fadeIn(_newEffect);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- script_v6.cpp	13 Aug 2003 16:38:02 -0000	1.178
+++ script_v6.cpp	13 Aug 2003 23:07:05 -0000	1.179
@@ -1540,7 +1540,7 @@
 	case 181:
 		a = pop();
 		if (a) {
-			_switchRoomEffect = (byte)(a);
+			_switchRoomEffect = (byte)(a&0xFF);
 			_switchRoomEffect2 = (byte)(a >> 8);
 		} else {
 			fadeIn(_newEffect);