aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorBastien Bouclet2017-07-09 15:23:26 +0200
committerBastien Bouclet2017-07-22 20:38:56 +0200
commita106dc8dd4a055821743ed5bf01a27171e093cd0 (patch)
tree6ee54ff3deb7252a4c24e6c0a93dae0274a4d667 /engines/mohawk
parentc5496e32068a24c53b6a9f0e633d4e0321c3c831 (diff)
downloadscummvm-rg350-a106dc8dd4a055821743ed5bf01a27171e093cd0.tar.gz
scummvm-rg350-a106dc8dd4a055821743ed5bf01a27171e093cd0.tar.bz2
scummvm-rg350-a106dc8dd4a055821743ed5bf01a27171e093cd0.zip
MOHAWK: Remove unused parameters VideoManager
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/myst_stacks/selenitic.cpp2
-rw-r--r--engines/mohawk/video.cpp20
-rw-r--r--engines/mohawk/video.h4
3 files changed, 9 insertions, 17 deletions
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index 8d2e660990..99cb5c4571 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -484,7 +484,7 @@ void Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
if (!file.empty()) {
const Common::Rect &dest = _mazeRunnerWindow->getRect();
- _vm->_video->playMovieBlocking(file, dest.left, dest.top, false);
+ _vm->_video->playMovieBlocking(file, dest.left, dest.top);
}
}
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 64f6f23641..6148472b1a 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -166,33 +166,25 @@ void VideoManager::stopVideos() {
_videos.clear();
}
-void VideoManager::playMovieBlocking(const Common::String &fileName, uint16 x, uint16 y, bool clearScreen) {
+void VideoManager::playMovieBlocking(const Common::String &fileName, uint16 x, uint16 y) {
VideoEntryPtr ptr = open(fileName);
if (!ptr)
return;
ptr->moveTo(x, y);
-
- // Clear screen if requested
- if (clearScreen) {
- _vm->_system->fillScreen(_vm->_system->getScreenFormat().RGBToColor(0, 0, 0));
- _vm->_system->updateScreen();
- }
-
ptr->start();
+
waitUntilMovieEnds(ptr);
}
-void VideoManager::playMovieBlockingCentered(const Common::String &fileName, bool clearScreen) {
+void VideoManager::playMovieBlockingCentered(const Common::String &fileName) {
VideoEntryPtr ptr = open(fileName);
if (!ptr)
return;
- // Clear screen if requested
- if (clearScreen) {
- _vm->_system->fillScreen(_vm->_system->getScreenFormat().RGBToColor(0, 0, 0));
- _vm->_system->updateScreen();
- }
+ // Clear screen
+ _vm->_system->fillScreen(_vm->_system->getScreenFormat().RGBToColor(0, 0, 0));
+ _vm->_system->updateScreen();
ptr->center();
ptr->start();
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index d8b3addc81..20da42948c 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -240,8 +240,8 @@ public:
virtual ~VideoManager();
// Generic movie functions
- void playMovieBlocking(const Common::String &filename, uint16 x = 0, uint16 y = 0, bool clearScreen = false);
- void playMovieBlockingCentered(const Common::String &filename, bool clearScreen = true);
+ void playMovieBlocking(const Common::String &filename, uint16 x, uint16 y);
+ void playMovieBlockingCentered(const Common::String &filename);
VideoEntryPtr playMovie(const Common::String &filename);
VideoEntryPtr playMovie(uint16 id);
bool updateMovies();