diff options
| author | Max Horn | 2009-03-08 08:17:59 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-08 08:17:59 +0000 |
| commit | 7bfab75a0814d0655a2504bf4c461df0000da0e4 (patch) | |
| tree | 8d7922f33785e96ce9b0eaf6766d879223457ab4 /engines/sci | |
| parent | efa5493b2d01efed5c9488b3c324469969812296 (diff) | |
| download | scummvm-rg350-7bfab75a0814d0655a2504bf4c461df0000da0e4.tar.gz scummvm-rg350-7bfab75a0814d0655a2504bf4c461df0000da0e4.tar.bz2 scummvm-rg350-7bfab75a0814d0655a2504bf4c461df0000da0e4.zip | |
SCI: Fixed regression in new_fast_forward_iterator
svn-id: r39215
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sfx/iterator.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/sfx/iterator_internal.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 3579d4729a..fe52d736f8 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -1227,7 +1227,6 @@ public: 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 @@ SongIterator *new_fast_forward_iterator(SongIterator *capsit, int delta) { if (capsit == NULL) return NULL; - FastForwardSongIterator *it = new FastForwardSongIterator(); + FastForwardSongIterator *it = new FastForwardSongIterator(capsit, delta); return it; } diff --git a/engines/sci/sfx/iterator_internal.h b/engines/sci/sfx/iterator_internal.h index 3c13841062..5dc80ab12b 100644 --- a/engines/sci/sfx/iterator_internal.h +++ b/engines/sci/sfx/iterator_internal.h @@ -175,7 +175,6 @@ protected: int _delta; /**< Remaining time */ public: - FastForwardSongIterator() {} // FIXME: Temp hack FastForwardSongIterator(SongIterator *capsit, int delta); int nextCommand(byte *buf, int *result); |