aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-01-06 17:46:38 +0000
committerFilippos Karapetis2009-01-06 17:46:38 +0000
commit9267961104f1564ab7abe50b3548e479d1cbeb55 (patch)
tree2cd228a4cad3e53ef148d80d9e241157b1843097
parente47379c9660c3b79a55bfac65e80c3282538bc83 (diff)
downloadscummvm-rg350-9267961104f1564ab7abe50b3548e479d1cbeb55.tar.gz
scummvm-rg350-9267961104f1564ab7abe50b3548e479d1cbeb55.tar.bz2
scummvm-rg350-9267961104f1564ab7abe50b3548e479d1cbeb55.zip
Updated SCUMM with the latest changes to video players
svn-id: r35759
-rw-r--r--engines/scumm/he/animation_he.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 9f18d1cda8..1915a05a94 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -40,13 +40,13 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer)
}
int MoviePlayer::getImageNum() {
- if (!_fileStream)
+ if (!videoIsLoaded())
return 0;
return _wizResNum;
}
int MoviePlayer::load(const char *filename, int flags, int image) {
- if (_fileStream) {
+ if (videoIsLoaded()) {
closeFile();
}
@@ -67,7 +67,7 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
}
void MoviePlayer::handleNextFrame() {
- if (_fileStream == false) {
+ if (!videoIsLoaded()) {
return;
}