[Scummvm-cvs-logs] CVS: scummvm/sky text.cpp,1.23,1.24 logic.cpp,1.51,1.52

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv4184/scummvm/sky

Modified Files:
	text.cpp logic.cpp 
Log Message:
Fixed MSVC warnings

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- text.cpp	26 May 2003 17:41:19 -0000	1.23
+++ text.cpp	26 May 2003 23:28:59 -0000	1.24
@@ -366,7 +366,7 @@
 
 	cpt->logic = logicNum; 
 	cpt->status = ST_LOGIC | ST_FOREGROUND | ST_RECREATE;
-	cpt->screen = SkyLogic::_scriptVariables[SCREEN]; 
+	cpt->screen = (uint16) SkyLogic::_scriptVariables[SCREEN]; 
 
 	struct lowTextManager_t ret;
 	ret.textData = _dtData;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- logic.cpp	26 May 2003 20:54:58 -0000	1.51
+++ logic.cpp	26 May 2003 23:28:59 -0000	1.52
@@ -1187,7 +1187,7 @@
 }
 
 bool SkyLogic::fnBlankMouse(uint32 a, uint32 b, uint32 c) {
-	return _skyMouse->fnBlankMouse();
+	return (_skyMouse->fnBlankMouse() != 0);
 }
 
 bool SkyLogic::fnCrossMouse(uint32 a, uint32 b, uint32 c) {
@@ -1441,7 +1441,7 @@
 	// We have hit another mega
 	// we are going to wait for it to move
 
-	_compact->extCompact->waitingFor = id;
+	_compact->extCompact->waitingFor = (uint16) id;
 	stopAndWait();
 	return true; // not sure about this
 }
@@ -1486,6 +1486,8 @@
 }
 
 bool SkyLogic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) {
+	uint i;
+
 	// initialise the top menu bar
 	// firstObject is o0 for game menu, k0 for linc
 
@@ -1504,7 +1506,7 @@
 	// sort the objects and pad with blanks
 
 	uint32 menuLength = 0;
-	for (uint i = firstObject; i < firstObject + ARRAYSIZE(_objectList); i++) {
+	for (i = firstObject; i < firstObject + ARRAYSIZE(_objectList); i++) {
 		if ( _scriptVariables[i] )
 			_objectList[menuLength++] = _scriptVariables[i];
 	}
@@ -1513,13 +1515,13 @@
 	// (3) OK, NOW TOP UP THE LIST WITH THE REQUIRED NO. OF BLANK OBJECTS (for min display length 11)
 
 	uint32 blankID = 51;
-	for (uint i = menuLength; i < 11; i++)
+	for (i = menuLength; i < 11; i++)
 		_objectList[i] = blankID++;
 
 	// (4) KILL ID's OF ALL 20 OBJECTS SO UNWANTED ICONS (SCROLLED OFF) DON'T REMAIN ON SCREEN
 	// (There should be a better way of doing this - only kill id of 12th item when menu has scrolled right)
 
-	for (int i = 0; i < ARRAYSIZE(_objectList); i++) {
+	for (i = 0; i < ARRAYSIZE(_objectList); i++) {
 		if (_objectList[i])
 			(SkyState::fetchCompact(_objectList[i]))->status = ST_LOGIC;
 	}
@@ -1534,7 +1536,7 @@
 	// (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN
 
 	uint16 rollingX = 128 + 28;
-	for (int i = 0; i < 11; i++) {
+	for (i = 0; i < 11; i++) {
 		cpt = SkyState::fetchCompact(
 				_objectList[_scriptVariables[SCROLL_OFFSET] + i]);