diff options
| author | D G Turner | 2017-03-20 11:10:19 +0000 |
|---|---|---|
| committer | D G Turner | 2017-03-20 11:10:19 +0000 |
| commit | bb252b428c4ca12886acb642b7dc9a3a9fcdefd2 (patch) | |
| tree | 4e468b9dcf4e35f27f2e53c14fce51e3ac71b919 /engines/director | |
| parent | 5a44168de6550e10df18b24beec98bf4e1aebf93 (diff) | |
| download | scummvm-rg350-bb252b428c4ca12886acb642b7dc9a3a9fcdefd2.tar.gz scummvm-rg350-bb252b428c4ca12886acb642b7dc9a3a9fcdefd2.tar.bz2 scummvm-rg350-bb252b428c4ca12886acb642b7dc9a3a9fcdefd2.zip | |
DIRECTOR: Fix GCC Warnings.
Diffstat (limited to 'engines/director')
| -rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 2 | ||||
| -rw-r--r-- | engines/director/score.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index cb6a7d67ec..e12b20a3c2 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -1232,7 +1232,7 @@ void Lingo::b_rollOver(int nargs) { Frame *frame = g_director->getCurrentScore()->_frames[g_director->getCurrentScore()->getCurrentFrame()]; - if (arg >= frame->_sprites.size()) { + if (arg >= (int32) frame->_sprites.size()) { g_lingo->push(d); return; } diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 472bd739c5..4f19ba78f9 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -1166,7 +1166,7 @@ void Score::update() { } Sprite *Score::getSpriteById(uint16 id) { - if (_currentFrame >= _frames.size() || _currentFrame < 0 || id >= _frames[_currentFrame]->_sprites.size()) { + if (_currentFrame >= _frames.size() || id >= _frames[_currentFrame]->_sprites.size()) { warning("Score::getSpriteById(%d): out of bounds. frame: %d", id, _currentFrame); return nullptr; } |