[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.22,1.23 string.cpp,1.25,1.26

[Pawe? Ko?odziejski]

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

Modified Files:
	script_v2.cpp string.cpp 
Log Message:
fixed warnings :)

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- script_v2.cpp	6 Oct 2002 06:36:22 -0000	1.22
+++ script_v2.cpp	6 Oct 2002 06:47:01 -0000	1.23
@@ -2822,10 +2822,10 @@
 			} else { 
 				setStringVars(0);
 
-                		_string[0].charset = args[1];
-                		_string[0].color = args[2];
-                		_string[0].xpos = args[3];
-                		_string[0].ypos = args[4];
+				_string[0].charset = (byte)args[1];
+				_string[0].color = (byte)args[2];
+				_string[0].xpos = args[3];
+				_string[0].ypos = args[4];
 
 				addMessageToStack(getStringAddressVar(VAR_STRING2DRAW));
 				drawDescString();

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- string.cpp	6 Oct 2002 06:09:32 -0000	1.25
+++ string.cpp	6 Oct 2002 06:47:01 -0000	1.26
@@ -631,7 +631,7 @@
 		charset._left -= charset.getStringWidth(a, buf, 0) >> 1;
 	}
 
-	if (!_features & GF_AFTER_V7)
+	if (!(_features & GF_AFTER_V7))
 		charset._ignoreCharsetMask = 1;