aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-01-07 22:06:15 +0000
committerFilippos Karapetis2009-01-07 22:06:15 +0000
commit9752501a07bd6e295a71cd0db72f7a06f14d0fa6 (patch)
tree112975b63c0a96cea545f567257cadbf4eed88b3
parent2e1fa58cf8907e344119391b830db8f6e1e1c1fa (diff)
downloadscummvm-rg350-9752501a07bd6e295a71cd0db72f7a06f14d0fa6.tar.gz
scummvm-rg350-9752501a07bd6e295a71cd0db72f7a06f14d0fa6.tar.bz2
scummvm-rg350-9752501a07bd6e295a71cd0db72f7a06f14d0fa6.zip
videoIsLoaded() -> isVideoLoaded()
svn-id: r35777
-rw-r--r--engines/scumm/he/animation_he.cpp6
-rw-r--r--graphics/video/video_player.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 1915a05a94..4a64f16f42 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 (!videoIsLoaded())
+ if (!isVideoLoaded())
return 0;
return _wizResNum;
}
int MoviePlayer::load(const char *filename, int flags, int image) {
- if (videoIsLoaded()) {
+ if (isVideoLoaded()) {
closeFile();
}
@@ -67,7 +67,7 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
}
void MoviePlayer::handleNextFrame() {
- if (!videoIsLoaded()) {
+ if (!isVideoLoaded()) {
return;
}
diff --git a/graphics/video/video_player.h b/graphics/video/video_player.h
index 18483043a7..ea9122499f 100644
--- a/graphics/video/video_player.h
+++ b/graphics/video/video_player.h
@@ -107,7 +107,7 @@ public:
/**
* Returns if a video file is loaded or not
*/
- bool videoIsLoaded() { return (_fileStream != NULL); }
+ bool isVideoLoaded() { return (_fileStream != NULL); }
/**
* Set RGB palette, based on current frame