From a1d11054b52822e3d85e0ad88e6d2ebbbeca8518 Mon Sep 17 00:00:00 2001
From: richiesams
Date: Mon, 26 Aug 2013 14:08:31 -0500
Subject: ZVISION: Fix signed/unsigned mismatch

---
 engines/zvision/rlf_animation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index f58aa0cdfe..77c1a50266 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -155,7 +155,7 @@ RlfAnimation::Frame RlfAnimation::readNextFrame() {
 
 const uint16 *RlfAnimation::getFrameData(uint frameNumber) {
 	assert(!_stream);
-	assert(frameNumber < _frameCount && frameNumber >= 0);
+	assert(frameNumber < _frameCount);
 
 	// Since this method is so expensive, first check to see if we can use
 	// getNextFrame() or getPreviousFrame() since they are cheap.
@@ -167,7 +167,7 @@ const uint16 *RlfAnimation::getFrameData(uint frameNumber) {
 		return getPreviousFrame();
 	}
 
-	uint closestFrame = _currentFrame;
+	int closestFrame = _currentFrame;
 	int distance = ABS(_currentFrame - (int)frameNumber);
 	for (Common::List<uint>::const_iterator iter = _completeFrames.begin(); iter != _completeFrames.end(); iter++) {
 		int newDistance = ABS((int)(*iter) - (int)frameNumber);
@@ -177,7 +177,7 @@ const uint16 *RlfAnimation::getFrameData(uint frameNumber) {
 		}
 	}
 
-	bool forwards = frameNumber > closestFrame;
+	bool forwards = (int)frameNumber > closestFrame;
 	if (forwards) {
 		for (uint i = closestFrame; i <= frameNumber; i++) {
 			applyFrameToCurrent(i);
-- 
cgit v1.2.3