diff options
| author | Paweł Kołodziejski | 2002-08-31 09:50:36 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-08-31 09:50:36 +0000 |
| commit | 3826c7c8a8fabf2bc0379de53b835b25adfa45c5 (patch) | |
| tree | 27c90bec2ea5e2b7ebd4520500182ce993f8cb38 /scumm/bundle.h | |
| parent | bd7b93061b368ef4e1a45efbce2ef7110969512c (diff) | |
| download | scummvm-rg350-3826c7c8a8fabf2bc0379de53b835b25adfa45c5.tar.gz scummvm-rg350-3826c7c8a8fabf2bc0379de53b835b25adfa45c5.tar.bz2 scummvm-rg350-3826c7c8a8fabf2bc0379de53b835b25adfa45c5.zip | |
changed Bundle to File class, cleanup
svn-id: r4874
Diffstat (limited to 'scumm/bundle.h')
| -rw-r--r-- | scumm/bundle.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scumm/bundle.h b/scumm/bundle.h index c95cc853cd..ac1656678d 100644 --- a/scumm/bundle.h +++ b/scumm/bundle.h @@ -22,8 +22,7 @@ #define BUNDLE_H #include "scummsys.h" - -class Scumm; +#include "file.h" class Bundle { @@ -45,17 +44,16 @@ struct BundleAudioTable { int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size); CompTable _compVoiceTable[50]; CompTable _compMusicTable[2500]; - FILE *_voiceFile; - FILE *_musicFile; + File _voiceFile; + File _musicFile; BundleAudioTable *_bundleVoiceTable; BundleAudioTable *_bundleMusicTable; int32 _numVoiceFiles; int32 _numMusicFiles; - Scumm *_scumm; int32 _lastSong; public: - Bundle(Scumm *parent); + Bundle(); ~Bundle(); bool openVoiceFile(char *filename); |