[Scummvm-cvs-logs] SF.net SVN: scummvm: [22988] scummvm/trunk/engines/gob

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Jun 8 21:55:23 CEST 2006


Revision: 22988
Author:   lordhoto
Date:     2006-06-08 12:55:16 -0700 (Thu, 08 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22988&view=rev

Log Message:
-----------
Fix some msvc8 warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.cpp
    scummvm/trunk/engines/gob/goblin.cpp
Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2006-06-08 19:43:37 UTC (rev 22987)
+++ scummvm/trunk/engines/gob/game.cpp	2006-06-08 19:55:16 UTC (rev 22988)
@@ -2286,7 +2286,7 @@
 	word_31451 = 0;
 
 	if (imdPtr == 0)
-		return 0x8000;
+		return (int16)0x8000;
 
 	retVal = 0;
 	var_4 = 0;
@@ -2347,7 +2347,7 @@
 				tmp = READ_LE_UINT16(buf);
 				imdPtr->filePos += 4;
 			} else if (tmp == 0xFFF1) {
-				retVal = 0x8000;
+				retVal = (int16)0x8000;
 				continue;
 			} else if (tmp == 0xFFF2) {
 				_vm->_dataio->readData(imdPtr->fileHandle, buf, 2);
@@ -2355,7 +2355,7 @@
 				imdPtr->filePos += 2;
 				_vm->_dataio->seekData(imdPtr->fileHandle, tmp, 1);
 				imdPtr->filePos += tmp;
-				retVal = 0x8000;
+				retVal = (int16)0x8000;
 				continue;
 			} else if (tmp == 0xFFF3) {
 				_vm->_dataio->readData(imdPtr->fileHandle, buf, 4);
@@ -2363,7 +2363,7 @@
 				imdPtr->filePos += 4;
 				_vm->_dataio->seekData(imdPtr->fileHandle, tmp, 1);
 				imdPtr->filePos += tmp;
-				retVal = 0x8000;
+				retVal = (int16)0x8000;
 				continue;
 			}
 		}

Modified: scummvm/trunk/engines/gob/goblin.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin.cpp	2006-06-08 19:43:37 UTC (rev 22987)
+++ scummvm/trunk/engines/gob/goblin.cpp	2006-06-08 19:55:16 UTC (rev 22988)
@@ -1773,7 +1773,7 @@
 	animData = obj->pAnimData;
 
 	for (i = 1; i <= obj->goblinStates[animData->state][0].dataCount; i++) {
-		speaker = obj->goblinStates[animData->state][i].speaker;
+		speaker = obj->goblinStates[animData->state][i].speaker != 0;
 		if ((obj->goblinStates[animData->state][i].sndItem != -1) || (speaker == 1)) {
 			frame = obj->goblinStates[animData->state][i].sndFrame;
 			repCount = obj->goblinStates[animData->state][i].repCount;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list