T7G: Fix bug #2853185 where card puzzle doesn't clean up, resulting in a blank menu in special instances

svn-id: r44009

4 files changed, 7 insertions, 1 deletions

diff --git a/engines/groovie/player.h b/engines/groovie/player.h
index cf2746137e..2ef340149a 100644
--- a/engines/groovie/player.h
+++ b/engines/groovie/player.h
@@ -40,6 +40,7 @@ public:
 
 	bool load(Common::SeekableReadStream *file, uint16 flags);
 	bool playFrame();
+	virtual void resetFlags() {};
 	virtual void setOrigin(int16 x, int16 y) {};
 
 protected:
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 8924726e7f..6b2a0c3176 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -1448,7 +1448,7 @@ void Script::o_returnscript() {
 	// Restore the filename of the script
 	_scriptFile = _savedScriptFile;
 
-	//TODO: reset script flags and previous video's flag1?
+	_vm->_videoPlayer->resetFlags();
 	_vm->_videoPlayer->setOrigin(0, 0);
 }
 
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 0bc6acb1c0..3e3e88a01d 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -43,6 +43,10 @@ VDXPlayer::~VDXPlayer() {
 	//delete _audioStream;
 }
 
+void VDXPlayer::resetFlags() {
+	_flagOnePrev = false;
+}
+
 void VDXPlayer::setOrigin(int16 x, int16 y) {
 	_origX = x;
 	_origY = y;
diff --git a/engines/groovie/vdx.h b/engines/groovie/vdx.h
index 226cc63843..207d2e0c18 100644
--- a/engines/groovie/vdx.h
+++ b/engines/groovie/vdx.h
@@ -34,6 +34,7 @@ class VDXPlayer : public VideoPlayer {
 public:
 	VDXPlayer(GroovieEngine *vm);
 	~VDXPlayer();
+	void resetFlags();
 	void setOrigin(int16 x, int16 y);
 
 protected: