aboutsummaryrefslogtreecommitdiff
path: root/sword1/animation.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-03-11 15:30:28 +0000
committerTorbjörn Andersson2005-03-11 15:30:28 +0000
commita52de03324bf07891be4ff4e161668ed59a78d6e (patch)
treed3ff780378dfeb8a3748598e46067ab1fcdb9eec /sword1/animation.cpp
parentd27f4116f488d5c6898c6a89f123d4c59e593b8e (diff)
downloadscummvm-rg350-a52de03324bf07891be4ff4e161668ed59a78d6e.tar.gz
scummvm-rg350-a52de03324bf07891be4ff4e161668ed59a78d6e.tar.bz2
scummvm-rg350-a52de03324bf07891be4ff4e161668ed59a78d6e.zip
Renamed variables in the MPEG animation classes to better conform with
ScummVM standard. It seems the 8-bit version of the code had decayed slightly, but I believe it's working again now. svn-id: r17081
Diffstat (limited to 'sword1/animation.cpp')
-rw-r--r--sword1/animation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index b363ea761f..927bdc7543 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -48,7 +48,7 @@ void AnimationState::setPalette(byte *pal) {
void AnimationState::drawYUV(int width, int height, byte *const *dat) {
#ifdef BACKEND_8BIT
- _scr->plotYUV(lut, width, height, dat);
+ _scr->plotYUV(_lut, width, height, dat);
#else
plotYUV(width, height, dat);
#endif
@@ -56,7 +56,7 @@ void AnimationState::drawYUV(int width, int height, byte *const *dat) {
void AnimationState::updateScreen(void) {
#ifndef BACKEND_8BIT
- _sys->copyRectToOverlay(overlay, MOVIE_WIDTH, 0, 40, MOVIE_WIDTH, MOVIE_HEIGHT);
+ _sys->copyRectToOverlay(_overlay, _movieWidth, 0, 40, _movieWidth, _movieHeight);
#endif
_sys->updateScreen();
}
@@ -65,12 +65,12 @@ OverlayColor *AnimationState::giveRgbBuffer(void) {
#ifdef BACKEND_8BIT
return NULL;
#else
- return overlay;
+ return _overlay;
#endif
}
bool AnimationState::soundFinished(void) {
- return !bgSound.isActive();
+ return !_bgSound.isActive();
}
AudioStream *AnimationState::createAudioStream(const char *name, void *arg) {