diff options
| author | Max Horn | 2009-05-12 23:32:32 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-12 23:32:32 +0000 |
| commit | 37a0157c970ee710ea704836d68a4c8dbd24d457 (patch) | |
| tree | e4e31e11f97d855af8324de64e36e17014ff4c77 /engines/sci/engine | |
| parent | 05c3c6ccb3ce41dbe5605073ed54a2290525e179 (diff) | |
| download | scummvm-rg350-37a0157c970ee710ea704836d68a4c8dbd24d457.tar.gz scummvm-rg350-37a0157c970ee710ea704836d68a4c8dbd24d457.tar.bz2 scummvm-rg350-37a0157c970ee710ea704836d68a4c8dbd24d457.zip | |
SCI: cleanup
svn-id: r40518
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 39b41734ee..e6b2a688cb 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -121,7 +121,7 @@ static void script_set_priority(EngineState *s, reg_t obj, int priority) { PUT_SEL32V(obj, flags, flags); } -SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) { +SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type, songit_id_t id) { Resource *song = s->resmgr->findResource(kResourceTypeSound, song_nr, 0); if (!song) diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index ce5e7fc28a..2cb048ba41 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -43,7 +43,7 @@ namespace Sci { // from ksound.cpp: -SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id); +SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type, songit_id_t id); #pragma mark - @@ -705,7 +705,7 @@ int _reset_graphics_input(EngineState *s); static void reconstruct_sounds(EngineState *s) { song_t *seeker; - int it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0; + SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0; if (s->sound.songlib.lib) seeker = *(s->sound.songlib.lib); |