MOHAWK: Cleanup named video handling

svn-id: r55188

2 files changed, 13 insertions, 21 deletions

diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index 417fa90aa3..eb5d2a63c6 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -107,14 +107,13 @@ void MystScriptParser_Dni::o_handPage(uint16 op, uint16 var, uint16 argc, uint16
 
 void MystScriptParser_Dni::atrus_run() {
 	if (_globals.ending == 2) {
-		VideoHandle handle = _vm->_video->findVideoHandle(0xFFFF);
-		if (handle == NULL_VID_HANDLE || _vm->_video->endOfVideo(handle)) {
+		if (!_vm->_video->isVideoPlaying()) {
 			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atrus2", kDniStack), 215, 77);
 			_globals.ending = 4;
 			_globals.bluePagesInBook = 63;
 			_globals.redPagesInBook = 63;
 		}
-		// TODO: Complete / fix
+		// TODO: Complete/fix
 	} else if (_globals.ending == 1) {
 		// TODO: Complete, loop atr1page end
 	} else if (_globals.ending != 3 && _globals.ending != 4) {
@@ -122,17 +121,15 @@ void MystScriptParser_Dni::atrus_run() {
 			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atr1page", kDniStack), 215, 77);
 			_globals.ending = 1;
 
-			// TODO: Complete, movie control / looping
+			// TODO: Complete, movie control/looping
 		} else {
 			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atr1nopg", kDniStack), 215, 77);
 			_globals.ending = 3;
 
-			// TODO: Complete, movie control / looping
+			// TODO: Complete, movie control/looping
 		}
-	} else {
-		VideoHandle handle = _vm->_video->findVideoHandle(0xFFFF);
-		if (handle == NULL_VID_HANDLE || _vm->_video->endOfVideo(handle))
-			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atrwrite", kDniStack), 215, 77, true);
+	} else if (!_vm->_video->isVideoPlaying()) {
+		_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("atrwrite", kDniStack), 215, 77, true);
 	}
 }
 
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp
index 139a4c6b38..505b311761 100644
--- a/engines/mohawk/myst_stacks/intro.cpp
+++ b/engines/mohawk/myst_stacks/intro.cpp
@@ -107,16 +107,14 @@ void MystScriptParser_Intro::introMovies_run() {
 		} else
 			_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("broder", kIntroStack));
 	} else if (_introStep == 1) {
-		VideoHandle handle = _vm->_video->findVideoHandle(0xFFFF);
-		if (handle == NULL_VID_HANDLE || _vm->_video->endOfVideo(handle))
+		if (!_vm->_video->isVideoPlaying())
 			_introStep = 2;
 	} else if (_introStep == 2) {
 		_introStep = 3;
 
 		_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cyanlogo", kIntroStack));
 	} else if (_introStep == 3) {
-		VideoHandle handle = _vm->_video->findVideoHandle(0xFFFF);
-		if (handle == NULL_VID_HANDLE || _vm->_video->endOfVideo(handle))
+		if (!_vm->_video->isVideoPlaying())
 			_introStep = 4;
 	}  else if (_introStep == 4) {
 		_introStep = 5;
@@ -129,15 +127,13 @@ void MystScriptParser_Intro::introMovies_run() {
 				_vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("intro", kIntroStack));
 		}
 	} else if (_introStep == 5) {
-		VideoHandle handle = _vm->_video->findVideoHandle(0xFFFF);
-		if (handle == NULL_VID_HANDLE || _vm->_video->endOfVideo(handle))
+		if (!_vm->_video->isVideoPlaying())
 			_introStep = 6;
 	} else {
-		if (_vm->getFeatures() & GF_DEMO) {
+		if (_vm->getFeatures() & GF_DEMO)
 			_vm->changeToCard(2001, true);
-		} else {
+		else
 			_vm->changeToCard(2, true);
-		}
 	}
 }
 
@@ -155,9 +151,8 @@ void MystScriptParser_Intro::mystLinkBook_run() {
 			_vm->_gfx->copyImageToBackBuffer(4, Common::Rect(544, 333));
 			_vm->_gfx->copyBackBufferToScreen(Common::Rect(544, 333));
 		}
-	} else {
-		if (!_linkBookMovie->isPlaying())
-			_vm->changeToCard(5, true);
+	} else if (!_linkBookMovie->isPlaying()) {
+		_vm->changeToCard(5, true);
 	}
 }