DIRECTOR: Fix GCC Warnings.

scummvm · Mar 20, 2017 · bb252b428c4ca12886acb642b7dc9a3a9fcdefd2 · bb252b4
1 parent 5a44168
commit bb252b428c4ca12886acb642b7dc9a3a9fcdefd2
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 engines/director/lingo/lingo-builtins.cpp

+1 −1 engines/director/score.cpp
diff --git 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
@@ -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;
 	}