[Scummvm-cvs-logs] scummvm master -> 7739e12e42edae68264a9675ede1bd840ae3be6b

[dreammaster]

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:
7739e12e42 MADS: Stop player disappearing after cutscene of fish being eaten


Commit: 7739e12e42edae68264a9675ede1bd840ae3be6b
    https://github.com/scummvm/scummvm/commit/7739e12e42edae68264a9675ede1bd840ae3be6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-02-15T09:50:14-05:00

Commit Message:
MADS: Stop player disappearing after cutscene of fish being eaten

Changed paths:
    engines/mads/player.cpp



diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index bde313a..e7993f3 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -509,10 +509,11 @@ void Player::idle() {
 		return;
 	}
 
-	if ((_spritesStart + _spritesIdx) < 0 || !_spriteSetsPresent[_spritesStart + _spritesIdx])
+	int idx = _spritesStart + _spritesIdx;
+	if (idx < 0 || (idx < PLAYER_SPRITES_FILE_COUNT && !_spriteSetsPresent[idx]))
 		return;
 
-	SpriteAsset &spriteSet = *scene._sprites[_spritesStart + _spritesIdx];
+	SpriteAsset &spriteSet = *scene._sprites[idx];
 	assert(spriteSet._charInfo);
 	if (spriteSet._charInfo->_numEntries == 0)
 		// No entries, so exit immediately