[Scummvm-cvs-logs] SF.net SVN: scummvm:[39215] scummvm/trunk/engines/sci/sfx

[fingolfin at users.sourceforge.net]

Revision: 39215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39215&view=rev
Author:   fingolfin
Date:     2009-03-08 08:17:59 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
SCI: Fixed regression in new_fast_forward_iterator

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/iterator.cpp
    scummvm/trunk/engines/sci/sfx/iterator_internal.h

Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-03-08 08:17:43 UTC (rev 39214)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-03-08 08:17:59 UTC (rev 39215)
@@ -1227,7 +1227,6 @@
 		flags = 0;
 	}
 
-	SongIterator *makeClone() { return 0; }
 	int nextCommand(byte *buf, int *result);
 	Audio::AudioStream *getAudioStream() { return NULL; }
 	SongIterator *handleMessage(SongIteratorMessage msg);
@@ -1342,7 +1341,7 @@
 	if (capsit == NULL)
 		return NULL;
 
-	FastForwardSongIterator *it = new FastForwardSongIterator();
+	FastForwardSongIterator *it = new FastForwardSongIterator(capsit, delta);
 	return it;
 }
 

Modified: scummvm/trunk/engines/sci/sfx/iterator_internal.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator_internal.h	2009-03-08 08:17:43 UTC (rev 39214)
+++ scummvm/trunk/engines/sci/sfx/iterator_internal.h	2009-03-08 08:17:59 UTC (rev 39215)
@@ -175,7 +175,6 @@
 	int _delta; /**< Remaining time */
 
 public:
-	FastForwardSongIterator() {}	// FIXME: Temp hack
 	FastForwardSongIterator(SongIterator *capsit, int delta);
 
 	int nextCommand(byte *buf, int *result);


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