diff options
| author | Paweł Kołodziejski | 2006-01-01 10:49:27 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2006-01-01 10:49:27 +0000 |
| commit | 59368294bbdbd4cc77fff2e754c71f1f312eb6ff (patch) | |
| tree | 352ace049282221ab85c504be75a536e7f0cb204 /kyra | |
| parent | 7bbfe2e4234ba7f814fe9d94a541a539496b5e5c (diff) | |
| download | scummvm-rg350-59368294bbdbd4cc77fff2e754c71f1f312eb6ff.tar.gz scummvm-rg350-59368294bbdbd4cc77fff2e754c71f1f312eb6ff.tar.bz2 scummvm-rg350-59368294bbdbd4cc77fff2e754c71f1f312eb6ff.zip | |
fixed warnings
svn-id: r19877
Diffstat (limited to 'kyra')
| -rw-r--r-- | kyra/debugger.cpp | 2 | ||||
| -rw-r--r-- | kyra/kyra.cpp | 2 | ||||
| -rw-r--r-- | kyra/sprites.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kyra/debugger.cpp b/kyra/debugger.cpp index fa0207035f..c1bc7fd65e 100644 --- a/kyra/debugger.cpp +++ b/kyra/debugger.cpp @@ -57,7 +57,7 @@ void Debugger::postEnter() { bool Debugger::cmd_enterRoom(int argc, const char **argv) { uint direction = 0; if (argc > 1) { - uint room = atoi(argv[1]); + int room = atoi(argv[1]); // game will crash if entering a non-existent room if (room >= _vm->_roomTableSize) { diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index c24d4ada97..6b8bccab32 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -2646,7 +2646,7 @@ void KyraEngine::initSceneObjectList(int brandonAlive) { if (curItem != 0xFF) { curAnimState->drawY = curRoom->itemsYPos[i]; curAnimState->sceneAnimPtr = _shapes[220+curItem]; - curAnimState->animFrameNumber = 0xFFFF; + curAnimState->animFrameNumber = (int16)0xFFFF; curAnimState->y1 = curRoom->itemsYPos[i]; curAnimState->x1 = curRoom->itemsXPos[i]; diff --git a/kyra/sprites.cpp b/kyra/sprites.cpp index 1b739e144b..6115c18c08 100644 --- a/kyra/sprites.cpp +++ b/kyra/sprites.cpp @@ -93,15 +93,15 @@ void Sprites::setupSceneAnims() { data += 4; _anims[i].sprite = READ_LE_UINT16(data); data += 4; - _anims[i].flipX = READ_LE_UINT16(data); + _anims[i].flipX = READ_LE_UINT16(data) != 0; data += 4; _anims[i].width2 = *(data); data += 4; _anims[i].height2 = *(data); data += 4; - _anims[i].unk1 = READ_LE_UINT16(data); + _anims[i].unk1 = READ_LE_UINT16(data) != 0; data += 4; - _anims[i].play = READ_LE_UINT16(data); + _anims[i].play = READ_LE_UINT16(data) != 0; data += 2; _anims[i].script = data; @@ -162,7 +162,7 @@ void Sprites::updateSceneAnims() { _anims[i].y = READ_LE_UINT16(data); data += 2; _anims[i].flipX = false; - refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1); + refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0); break; case 0xFF8D: data += 2; @@ -179,7 +179,7 @@ void Sprites::updateSceneAnims() { _anims[i].y = READ_LE_UINT16(data); data += 2; _anims[i].flipX = true; - refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1); + refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0); break; case 0xFF8A: data += 2; @@ -258,7 +258,7 @@ void Sprites::updateSceneAnims() { _anims[i].sprite = READ_LE_UINT16(data); _anims[i].flipX = false; data += 2; - refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1); + refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0); break; case 0xFF91: data += 2; @@ -267,7 +267,7 @@ void Sprites::updateSceneAnims() { _anims[i].sprite = READ_LE_UINT16(data); _anims[i].flipX = true; data += 2; - refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1); + refreshSceneAnimObject(i, _anims[i].sprite, _anims[i].x, _anims[i].y, _anims[i].flipX, _anims[i].unk1 != 0); break; case 0xFF92: data += 2; |