aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-08-26 14:08:31 -0500
committerrichiesams2013-08-28 16:44:22 -0500
commita1d11054b52822e3d85e0ad88e6d2ebbbeca8518 (patch)
tree2f39171531cc4979ee0b8020043da3882d3985b3
parente32f6f7e38a8fde2283dcefa2042056778cb4579 (diff)
downloadscummvm-rg350-a1d11054b52822e3d85e0ad88e6d2ebbbeca8518.tar.gz
scummvm-rg350-a1d11054b52822e3d85e0ad88e6d2ebbbeca8518.tar.bz2
scummvm-rg350-a1d11054b52822e3d85e0ad88e6d2ebbbeca8518.zip
ZVISION: Fix signed/unsigned mismatch
-rw-r--r--engines/zvision/rlf_animation.cpp6
1 files 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);