ACCESS: Implemented cmdVideoEnded

scummvm · Aug 29, 2014 · 661a569 · 661a569
1 parent 729f03f
commit 661a569
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
@@ -105,7 +105,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
 		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
-		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
+		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
@@ -457,7 +457,13 @@ void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollY = 0;
 }
 
-void Scripts::CMDSAVERECT() { error("TODO CMDSAVERECT"); }
+void Scripts::cmdVideoEnded() { 
+	if (_vm->_video->_videoEnd)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
+
 void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); }
 void Scripts::CMDPLAYBUFVID() { error("TODO CMDPLAYBUFVID"); }
 

diff --git a/engines/access/scripts.h b/engines/access/scripts.h
@@ -96,7 +96,7 @@ class Scripts: public Manager {
 	void cmdSetDisplay();
 	void cmdSetBuffer();
 	void cmdSetScroll();
-	void CMDSAVERECT();
+	void cmdVideoEnded();
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
 	void cmdRemoveLast();

diff --git a/engines/access/video.h b/engines/access/video.h
@@ -48,13 +48,13 @@ class VideoPlayer: public Manager {
 	int _xCount;
 	int _scanCount;
 	int _frameSize;
-	bool _videoEnd;
 
 	void getFrame();
 public:
 	int _videoFrame;
 	bool _soundFlag;
 	int _soundFrame;
+	bool _videoEnd;
 public:
 	VideoPlayer(AccessEngine *vm);
 	~VideoPlayer();