diff options
Diffstat (limited to 'sword1')
-rw-r--r-- | sword1/animation.cpp | 8 | ||||
-rw-r--r-- | sword1/screen.cpp | 4 | ||||
-rw-r--r-- | sword1/screen.h | 2 |
3 files changed, 8 insertions, 6 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) { diff --git a/sword1/screen.cpp b/sword1/screen.cpp index 23b4f154bf..994419261b 100644 --- a/sword1/screen.cpp +++ b/sword1/screen.cpp @@ -32,6 +32,10 @@ #include "sword1/menu.h" #include "sword1/sword1.h" +#ifdef BACKEND_8BIT +#include "sword1/animation.h" +#endif + #if defined(__PALM_OS__) #include "arm/native.h" #include "arm/macros.h" diff --git a/sword1/screen.h b/sword1/screen.h index 72f382ed3b..2392039680 100644 --- a/sword1/screen.h +++ b/sword1/screen.h @@ -95,8 +95,6 @@ public: void plotYUV(byte *lut, int width, int height, byte *const *dat); #endif - - private: // for router debugging void drawLine(uint16 x1, uint16 y1, uint16 x2, uint16 y2); |