[Scummvm-cvs-logs] SF.net SVN: scummvm: [29075] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 29075
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29075&view=rev
Author:   lordhoto
Date:     2007-09-23 15:43:46 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
Fix for kyra3 crashes while playing WSA files.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.h
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2007-09-23 22:29:05 UTC (rev 29074)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2007-09-23 22:43:46 UTC (rev 29075)
@@ -90,7 +90,7 @@
 	virtual Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() { return _screen; }
 	
-	Movie *createWSAMovie();
+	virtual Movie *createWSAMovie();
 protected:
 	// Main menu code, also used for Kyra 3
 	static const char *_mainMenuStrings[];

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2007-09-23 22:29:05 UTC (rev 29074)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2007-09-23 22:43:46 UTC (rev 29075)
@@ -697,5 +697,12 @@
 	return size != 0 && buffer != 0;
 }
 
+Movie *KyraEngine_v3::createWSAMovie() {
+	WSAMovieV2 *movie = new WSAMovieV2(this);
+	assert(movie);
+	movie->flagOldOff(true);
+	return movie;
+}
+
 } // end of namespace Kyra
 

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2007-09-23 22:29:05 UTC (rev 29074)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2007-09-23 22:43:46 UTC (rev 29075)
@@ -42,6 +42,8 @@
 	int go();
 
 	void playVQA(const char *name);
+
+	virtual Movie *createWSAMovie();
 private:
 	int init();
 


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