diff options
| -rw-r--r-- | scumm/bomp.cpp | 2 | ||||
| -rw-r--r-- | scumm/bundle.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp index 38df197cf7..2b703408cb 100644 --- a/scumm/bomp.cpp +++ b/scumm/bomp.cpp @@ -144,7 +144,7 @@ void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte * byte tmp = *line_buffer++; if (tmp != transparency) { if (tmp == 13) { - tmp = shadowPalette[*(dst)]; + tmp = shadowPalette[*dst]; } *dst = tmp; } diff --git a/scumm/bundle.h b/scumm/bundle.h index 37036984c6..e3d4eaac60 100644 --- a/scumm/bundle.h +++ b/scumm/bundle.h @@ -54,23 +54,27 @@ private: File _voiceFile; File _musicFile; + + void initializeImcTables(); + int32 compDecode(byte *src, byte *dst); int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size); + int32 decompressVoiceSampleByIndex(int32 index, byte **comp_final); + int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final); + int32 getNumberOfMusicSamplesByIndex(int32 index); + public: Bundle(); ~Bundle(); - void initializeImcTables(); bool openVoiceFile(const char *filename, const char *directory); bool openMusicFile(const char *filename, const char *directory); void closeVoiceFile(); void closeMusicFile(); + int32 decompressVoiceSampleByName(const char *name, byte **comp_final); - int32 decompressVoiceSampleByIndex(int32 index, byte **comp_final); int32 decompressMusicSampleByName(const char *name, int32 number, byte *comp_final); - int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final); - int32 getNumberOfMusicSamplesByIndex(int32 index); int32 getNumberOfMusicSamplesByName(const char *name); }; |