aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-01-05 15:10:13 +0000
committerFilippos Karapetis2009-01-05 15:10:13 +0000
commit7f9ea7e35c907d44ce84e990b1b3258e214fac91 (patch)
treea8916fd594a3eb417f188f993e40866286eeca86 /engines
parentdc661e62a99118d8aba80f1f3533b0c78a440e75 (diff)
downloadscummvm-rg350-7f9ea7e35c907d44ce84e990b1b3258e214fac91.tar.gz
scummvm-rg350-7f9ea7e35c907d44ce84e990b1b3258e214fac91.tar.bz2
scummvm-rg350-7f9ea7e35c907d44ce84e990b1b3258e214fac91.zip
Added Doxygen-like comments to the FLIC player, and changed it a bit to have similar method names as the DXA and Smacker players. Also, removed the convenience method hasFrames(), as it's the same as getFrameCount() > 0
svn-id: r35741
Diffstat (limited to 'engines')
-rw-r--r--engines/tucker/sequences.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index edcb60c312..8fb06403c4 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -896,7 +896,7 @@ void AnimationSequencePlayer::openAnimation(int index, const char *fileName) {
_seqNum = 1;
return;
}
- _flicPlayer[index].decodeFrame();
+ _flicPlayer[index].decodeNextFrame();
if (index == 0) {
memcpy(_animationPalette, _flicPlayer[index].getPalette(), 1024);
memcpy(_offscreenBuffer, _flicPlayer[index].getOffscreen(), kScreenWidth * kScreenHeight);
@@ -904,7 +904,7 @@ void AnimationSequencePlayer::openAnimation(int index, const char *fileName) {
}
void AnimationSequencePlayer::decodeNextAnimationFrame(int index) {
- _flicPlayer[index].decodeFrame();
+ _flicPlayer[index].decodeNextFrame();
memcpy(_offscreenBuffer, _flicPlayer[index].getOffscreen(), kScreenWidth * kScreenHeight);
if (index == 0) {
if (_flicPlayer[index].isPaletteDirty()) {
@@ -940,12 +940,12 @@ void AnimationSequencePlayer::introSeq19_20() {
_newSeq = false;
}
if (_flicPlayer[0].getCurFrame() >= 116) {
- _flicPlayer[1].decodeFrame();
+ _flicPlayer[1].decodeNextFrame();
if (_flicPlayer[1].isLastFrame()) {
_flicPlayer[1].reset();
}
}
- _flicPlayer[0].decodeFrame();
+ _flicPlayer[0].decodeNextFrame();
const uint8 *t = _flicPlayer[1].getOffscreen();
for (int i = 0; i < 64000; ++i) {
const uint8 color = _flicPlayer[0].getOffscreen()[i];