aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorAlyssa Milburn2013-04-19 00:42:28 +0200
committerAlyssa Milburn2013-04-19 00:42:28 +0200
commitba9efd5c4016fcd755544cb1b68fc1bd42dd8e5e (patch)
tree5c166ac88677d752df156bdae351cc65b52845ff /engines/mohawk
parent73d629461994675abfbf2444594dcbd136ed9076 (diff)
downloadscummvm-rg350-ba9efd5c4016fcd755544cb1b68fc1bd42dd8e5e.tar.gz
scummvm-rg350-ba9efd5c4016fcd755544cb1b68fc1bd42dd8e5e.tar.bz2
scummvm-rg350-ba9efd5c4016fcd755544cb1b68fc1bd42dd8e5e.zip
MOHAWK: Allow skipping LB videos, plus other video bits.
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/livingbooks.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 2b0a45d4e6..43e21cfbfb 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -245,6 +245,8 @@ Common::Error MohawkEngine_LivingBooks::run() {
case Common::KEYCODE_ESCAPE:
if (_curMode == kLBIntroMode)
tryLoadPageStart(kLBControlMode, 1);
+ else
+ _video->stopVideos();
break;
case Common::KEYCODE_LEFT:
@@ -3775,7 +3777,7 @@ LBMovieItem::~LBMovieItem() {
void LBMovieItem::update() {
if (_playing) {
VideoHandle videoHandle = _vm->_video->findVideoHandle(_resourceId);
- if (_vm->_video->endOfVideo(videoHandle))
+ if (videoHandle == NULL_VID_HANDLE || _vm->_video->endOfVideo(videoHandle))
done(true);
}
@@ -3785,6 +3787,7 @@ void LBMovieItem::update() {
bool LBMovieItem::togglePlaying(bool playing, bool restart) {
if (playing) {
if ((_loaded && _enabled && _globalEnabled) || _phase == kLBPhaseNone) {
+ debug("toggled video for phase %d", _phase);
_vm->_video->playMovie(_resourceId, _rect.left, _rect.top);
return true;