diff options
| author | Johannes Schickel | 2006-06-08 19:55:16 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-06-08 19:55:16 +0000 |
| commit | 276d754443c28624d657e164ff889a1d910181ec (patch) | |
| tree | 6a98b383e8c2f16100387fda1fba65fc85ebf32b /engines/gob | |
| parent | 15aee485ea5fb5f436ffc93341b0bac978f648f7 (diff) | |
| download | scummvm-rg350-276d754443c28624d657e164ff889a1d910181ec.tar.gz scummvm-rg350-276d754443c28624d657e164ff889a1d910181ec.tar.bz2 scummvm-rg350-276d754443c28624d657e164ff889a1d910181ec.zip | |
Fix some msvc8 warnings.
svn-id: r22988
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/game.cpp | 8 | ||||
| -rw-r--r-- | engines/gob/goblin.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 189451eb1f..8b01ccc71d 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -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; } } diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index 9794ca9b07..a0d93469f5 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -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; |