aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichieSams2013-10-01 17:47:57 -0500
committerRichieSams2013-10-02 09:09:54 -0500
commit4c06affe84640ffa1fc8487a4344b41c225d7d8e (patch)
treebc4644a42a9f81e1243927e2c9ef962884830369
parent4172334b51a33c0b68ad81ceba2aaf1a6e70d8f2 (diff)
downloadscummvm-rg350-4c06affe84640ffa1fc8487a4344b41c225d7d8e.tar.gz
scummvm-rg350-4c06affe84640ffa1fc8487a4344b41c225d7d8e.tar.bz2
scummvm-rg350-4c06affe84640ffa1fc8487a4344b41c225d7d8e.zip
ZVISION: Convert _completeFrames to an Array
-rw-r--r--engines/zvision/rlf_animation.cpp6
-rw-r--r--engines/zvision/rlf_animation.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index 008a246267..f0d5ac5284 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -164,10 +164,10 @@ void RlfAnimation::seekToFrame(int frameNumber) {
int closestFrame = _currentFrame;
int distance = (int)frameNumber - _currentFrame;
- for (Common::List<uint>::const_iterator iter = _completeFrames.begin(); iter != _completeFrames.end(); ++iter) {
- int newDistance = (int)frameNumber - (int)(*iter);
+ for (int i = 0; i < _completeFrames.size(); ++i) {
+ int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
if (newDistance > 0 && (closestFrame == -1 || newDistance < distance)) {
- closestFrame = (*iter);
+ closestFrame = _completeFrames[i];
distance = newDistance;
}
}
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index ca9004f8b6..53247eb4ab 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -62,7 +62,7 @@ private:
uint _height;
uint32 _frameTime; // In milliseconds
Frame *_frames;
- Common::List<uint> _completeFrames;
+ Common::Array<uint> _completeFrames;
int _currentFrame;
Graphics::Surface _currentFrameBuffer;