diff options
| author | Filippos Karapetis | 2010-06-23 11:22:44 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-23 11:22:44 +0000 |
| commit | 3569b496622a61eb7d82c3033b188c4cd0426ae6 (patch) | |
| tree | f12830f82592ad0f537cb3be9f70c973a14b0e91 /engines/m4/assets.cpp | |
| parent | 717005bf25b6e74f22418324845f363eb4a1068d (diff) | |
| download | scummvm-rg350-3569b496622a61eb7d82c3033b188c4cd0426ae6.tar.gz scummvm-rg350-3569b496622a61eb7d82c3033b188c4cd0426ae6.tar.bz2 scummvm-rg350-3569b496622a61eb7d82c3033b188c4cd0426ae6.zip | |
Changed some asserts to warnings
svn-id: r50175
Diffstat (limited to 'engines/m4/assets.cpp')
| -rw-r--r-- | engines/m4/assets.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/m4/assets.cpp b/engines/m4/assets.cpp index 1f3cf278ae..c329373add 100644 --- a/engines/m4/assets.cpp +++ b/engines/m4/assets.cpp @@ -320,7 +320,12 @@ void SpriteAsset::loadFrameHeader(SpriteAssetFrame &frameHeader, bool isBigEndia } M4Sprite *SpriteAsset::getFrame(int frameIndex) { - return _frames[frameIndex].frame; + if ((uint)frameIndex < _frames.size()) { + return _frames[frameIndex].frame; + } else { + warning("SpriteAsset::getFrame: Invalid frame %d, out of %d", frameIndex, _frames.size()); + return _frames[_frames.size() - 1].frame; + } } void SpriteAsset::loadStreamingFrame(M4Sprite *frame, int frameIndex, int destX, int destY) { |