libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some msvc8 warnings.

Browse Source 
svn-id: r22988
This commit is contained in:
Johannes Schickel 2006-06-08 19:55:16 +00:00
parent 15aee485ea
commit 276d754443
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/gob/game.cpp
View File

@ -2286,7 +2286,7 @@ int16 Game::viewImd(Game::Imd *imdPtr, int16 frame) {
word_31451 = 0;
if (imdPtr == 0)
return 0x8000;
return (int16)0x8000;
retVal = 0;
var_4 = 0;
@ -2347,7 +2347,7 @@ int16 Game::viewImd(Game::Imd *imdPtr, int16 frame) {
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 @@ int16 Game::viewImd(Game::Imd *imdPtr, int16 frame) {
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 @@ int16 Game::viewImd(Game::Imd *imdPtr, int16 frame) {
imdPtr->filePos += 4;
_vm->_dataio->seekData(imdPtr->fileHandle, tmp, 1);
imdPtr->filePos += tmp;
retVal = 0x8000;
retVal = (int16)0x8000;
continue;
}
}

2
engines/gob/goblin.cpp
View File

@ -1773,7 +1773,7 @@ void Goblin::playSounds(Mult::Mult_Object *obj) {
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;