[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.15,2.16 string.cpp,1.66,1.67

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Dec 25 18:14:03 CET 2002


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

Modified Files:
	scummvm.cpp string.cpp 
Log Message:
fixed compilation under VC6

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- scummvm.cpp	26 Dec 2002 01:47:40 -0000	2.15
+++ scummvm.cpp	26 Dec 2002 02:13:19 -0000	2.16
@@ -1205,7 +1205,7 @@
 
 	if (_leftBtnPressed & msClicked && _rightBtnPressed & msClicked) {
 		_mouseButStat = 0;
-		_lastKeyHit = _vars[VAR_CUTSCENEEXIT_KEY];
+		_lastKeyHit = (uint)_vars[VAR_CUTSCENEEXIT_KEY];
 	} else if (_leftBtnPressed & msClicked) {
 		_mouseButStat = MBS_LEFT_CLICK;
 	} else if (_rightBtnPressed & msClicked) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- string.cpp	26 Dec 2002 00:21:19 -0000	1.66
+++ string.cpp	26 Dec 2002 02:13:19 -0000	1.67
@@ -104,7 +104,7 @@
 				s = (a->scaley * (int)_vars[VAR_V5_TALK_STRING_Y]) / 0xFF;
 				_string[0].ypos = ((_vars[VAR_V5_TALK_STRING_Y] - s) >> 1) + s - a->elevation + a->y;
 			} else {
-				_string[0].ypos = _vars[VAR_V5_TALK_STRING_Y];
+				_string[0].ypos = (int)_vars[VAR_V5_TALK_STRING_Y];
 			}
 			if (_string[0].ypos < 1)
 				_string[0].ypos = 1;
@@ -254,7 +254,7 @@
 
 			_charset->_nextLeft = _charset->_left;
 			_charset->_nextTop = _charset->_top;
-			_talkDelay += _vars[VAR_CHARINC];
+			_talkDelay += (int)_vars[VAR_CHARINC];
 			continue;
 		}
 





More information about the Scummvm-git-logs mailing list