[Scummvm-git-logs] scummvm master -> bb252b428c4ca12886acb642b7dc9a3a9fcdefd2

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bb252b428c DIRECTOR: Fix GCC Warnings.


Commit: bb252b428c4ca12886acb642b7dc9a3a9fcdefd2
    https://github.com/scummvm/scummvm/commit/bb252b428c4ca12886acb642b7dc9a3a9fcdefd2
Author: D G Turner (digitall at scummvm.org)
Date: 2017-03-20T11:10:19Z

Commit Message:
DIRECTOR: Fix GCC Warnings.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/score.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index cb6a7d6..e12b20a 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 472bd73..4f19ba7 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;
 	}