diff options
| author | Filippos Karapetis | 2009-12-27 12:21:12 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-27 12:21:12 +0000 |
| commit | 6af32b5b3a5c2bf5cb96c91c8abc3dbfd7589f7f (patch) | |
| tree | 94c4fba7b541738100ae3422a0955f12ea85b6e1 /engines/sci/sfx | |
| parent | e6ad7523c8acdd1bf0fc37e841da627f568d6fcd (diff) | |
| download | scummvm-rg350-6af32b5b3a5c2bf5cb96c91c8abc3dbfd7589f7f.tar.gz scummvm-rg350-6af32b5b3a5c2bf5cb96c91c8abc3dbfd7589f7f.tar.bz2 scummvm-rg350-6af32b5b3a5c2bf5cb96c91c8abc3dbfd7589f7f.zip | |
Really fixed compilation
svn-id: r46630
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/music.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h index 574dc15e6f..ff2c27e8d3 100644 --- a/engines/sci/sfx/music.h +++ b/engines/sci/sfx/music.h @@ -86,7 +86,12 @@ struct MusicEntry { typedef Common::Array<MusicEntry *> MusicList; -class SciMusic : public Common::Serializable { +class SciMusic +#ifndef USE_OLD_MUSIC_FUNCTIONS + : public Common::Serializable +#endif +{ + public: SciMusic(SciVersion soundVersion); ~SciMusic(); @@ -136,7 +141,9 @@ public: void reconstructSounds(int savegame_version); +#ifndef USE_OLD_MUSIC_FUNCTIONS virtual void saveLoadWithSerializer(Common::Serializer &ser); +#endif protected: byte findAudEntry(uint16 nAud, byte&oVolume, uint32& oOffset, uint32&oSize); |