diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/sfx/iterator.cpp | 21 | ||||
-rw-r--r-- | engines/sci/sfx/iterator_internal.h | 10 |
2 files changed, 5 insertions, 26 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 8c34212f44..ba82211ada 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -1169,10 +1169,6 @@ int CleanupSongIterator::nextCommand(byte *buf, int *result) { /**********************/ /*-- Timer iterator --*/ /**********************/ -TimerSongIterator::TimerSongIterator(int delta) - : _delta(delta) { -} - int TimerSongIterator::nextCommand(byte *buf, int *result) { if (_delta) { int d = _delta; @@ -1182,23 +1178,6 @@ int TimerSongIterator::nextCommand(byte *buf, int *result) { return SI_FINISHED; } -SongIterator *TimerSongIterator::handleMessage(Message msg) { - return NULL; -} - -int TimerSongIterator::getTimepos() { - return 0; -} - -Audio::AudioStream *TimerSongIterator::getAudioStream() { - return NULL; -} - -SongIterator *TimerSongIterator::clone(int delta) { - TimerSongIterator *newit = new TimerSongIterator(*this); - return newit; -} - SongIterator *new_timer_iterator(int delta) { return new TimerSongIterator(delta); } diff --git a/engines/sci/sfx/iterator_internal.h b/engines/sci/sfx/iterator_internal.h index 54920ba17a..7c9c1c71a4 100644 --- a/engines/sci/sfx/iterator_internal.h +++ b/engines/sci/sfx/iterator_internal.h @@ -190,13 +190,13 @@ protected: int _delta; /**!< Remaining time */ public: - TimerSongIterator(int delta); + TimerSongIterator(int delta) : _delta(delta) {} int nextCommand(byte *buf, int *result); - Audio::AudioStream *getAudioStream(); - SongIterator *handleMessage(Message msg); - int getTimepos(); - SongIterator *clone(int delta); + Audio::AudioStream *getAudioStream() { return NULL; } + SongIterator *handleMessage(Message msg) { return NULL; } + int getTimepos() { return 0; } + SongIterator *clone(int delta) { return new TimerSongIterator(*this); } }; /**********************************/ |