From 3569b496622a61eb7d82c3033b188c4cd0426ae6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 23 Jun 2010 11:22:44 +0000
Subject: Changed some asserts to warnings

svn-id: r50175
---
 engines/m4/assets.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/m4/assets.cpp')

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) {
-- 
cgit v1.2.3