[Scummvm-cvs-logs] SF.net SVN: scummvm:[44010] scummvm/branches/branch-1-0-0/engines/groovie

[scott_t at users.sourceforge.net]

Revision: 44010
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44010&view=rev
Author:   scott_t
Date:     2009-09-08 06:29:12 +0000 (Tue, 08 Sep 2009)

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

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/groovie/player.h
    scummvm/branches/branch-1-0-0/engines/groovie/script.cpp
    scummvm/branches/branch-1-0-0/engines/groovie/vdx.cpp
    scummvm/branches/branch-1-0-0/engines/groovie/vdx.h

Modified: scummvm/branches/branch-1-0-0/engines/groovie/player.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/player.h	2009-09-08 06:23:50 UTC (rev 44009)
+++ scummvm/branches/branch-1-0-0/engines/groovie/player.h	2009-09-08 06:29:12 UTC (rev 44010)
@@ -40,6 +40,7 @@
 
 	bool load(Common::SeekableReadStream *file, uint16 flags);
 	bool playFrame();
+	virtual void resetFlags() {};
 	virtual void setOrigin(int16 x, int16 y) {};
 
 protected:

Modified: scummvm/branches/branch-1-0-0/engines/groovie/script.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/script.cpp	2009-09-08 06:23:50 UTC (rev 44009)
+++ scummvm/branches/branch-1-0-0/engines/groovie/script.cpp	2009-09-08 06:29:12 UTC (rev 44010)
@@ -1434,7 +1434,7 @@
 	// 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);
 }
 

Modified: scummvm/branches/branch-1-0-0/engines/groovie/vdx.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/vdx.cpp	2009-09-08 06:23:50 UTC (rev 44009)
+++ scummvm/branches/branch-1-0-0/engines/groovie/vdx.cpp	2009-09-08 06:29:12 UTC (rev 44010)
@@ -43,6 +43,10 @@
 	//delete _audioStream;
 }
 
+void VDXPlayer::resetFlags() {
+	_flagOnePrev = false;
+}
+
 void VDXPlayer::setOrigin(int16 x, int16 y) {
 	_origX = x;
 	_origY = y;

Modified: scummvm/branches/branch-1-0-0/engines/groovie/vdx.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/vdx.h	2009-09-08 06:23:50 UTC (rev 44009)
+++ scummvm/branches/branch-1-0-0/engines/groovie/vdx.h	2009-09-08 06:29:12 UTC (rev 44010)
@@ -34,6 +34,7 @@
 public:
 	VDXPlayer(GroovieEngine *vm);
 	~VDXPlayer();
+	void resetFlags();
 	void setOrigin(int16 x, int16 y);
 
 protected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.