libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #1519817, "ALL: Build failure if libmpeg2 is disabled".

Browse Source 
svn-id: r23470
This commit is contained in:
Torbjörn Andersson 2006-07-10 09:29:12 +00:00
parent f4b81b55ec
commit d8e974ba72
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engines/sword2/animation.cpp
View File

@ -481,6 +481,8 @@ bool MoviePlayerDXA::load(const char *name, MovieTextObject *text[]) {
#endif
#ifdef USE_MPEG2
///////////////////////////////////////////////////////////////////////////////
// Movie player for the old MPEG movies
///////////////////////////////////////////////////////////////////////////////
@ -538,7 +540,23 @@ bool MoviePlayerMPEG::decodeFrame() {
return result;
}
#ifndef BACKEND_8BIT
AnimationState::AnimationState(Sword2Engine *vm, MoviePlayer *player)
: BaseAnimationState(vm->_mixer, vm->_system, 640, 480) {
_vm = vm;
_player = player;
}
AnimationState::~AnimationState() {
}
#ifdef BACKEND_8BIT
void AnimationState::setPalette(byte *pal) {
_player->updatePalette(pal, false);
}
#else
void MoviePlayerMPEG::handleScreenChanged() {
_anim->handleScreenChanged();
}
@ -559,22 +577,6 @@ void MoviePlayerMPEG::drawTextObject(MovieTextObject *t) {
_anim->drawTextObject(t->textSprite, _textSurface);
}
}
#endif
AnimationState::AnimationState(Sword2Engine *vm, MoviePlayer *player)
: BaseAnimationState(vm->_mixer, vm->_system, 640, 480) {
_vm = vm;
_player = player;
}
AnimationState::~AnimationState() {
}
#ifdef BACKEND_8BIT
void AnimationState::setPalette(byte *pal) {
_player->updatePalette(pal, false);
}
#else
void AnimationState::drawTextObject(SpriteInfo *s, byte *src) {
int moviePitch = _movieScale * _movieWidth;
@ -625,7 +627,6 @@ void AnimationState::drawTextObject(SpriteInfo *s, byte *src) {
src += s->w;
}
}
#endif
void AnimationState::clearScreen() {
@ -670,6 +671,8 @@ void AnimationState::drawYUV(int width, int height, byte *const *dat) {
#endif
}
#endif
///////////////////////////////////////////////////////////////////////////////
// Dummy player for subtitled speech only
///////////////////////////////////////////////////////////////////////////////