aboutsummaryrefslogtreecommitdiff
path: root/scumm.h
diff options
context:
space:
mode:
authorJames Brown2002-04-29 08:28:27 +0000
committerJames Brown2002-04-29 08:28:27 +0000
commit5f9bd8343c6362f844bcdb5b207bafde5db75bf3 (patch)
tree986723d40aa03ad5452b7c6308c904bde3492b9f /scumm.h
parentc134803976bcaccd9fe76da14b81962ebc531e81 (diff)
downloadscummvm-rg350-5f9bd8343c6362f844bcdb5b207bafde5db75bf3.tar.gz
scummvm-rg350-5f9bd8343c6362f844bcdb5b207bafde5db75bf3.tar.bz2
scummvm-rg350-5f9bd8343c6362f844bcdb5b207bafde5db75bf3.zip
Small inSANE patch for the dig, and start of Dig Audio support.
It seems to crash using AUTOFREE for some reason. Can someone Valgrind/Purify this for me? svn-id: r4129
Diffstat (limited to 'scumm.h')
-rw-r--r--scumm.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/scumm.h b/scumm.h
index 8c01b1a194..ca4d80f863 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1016,9 +1016,11 @@ public:
MP3OffsetTable *offset_table; // SO3 MP3 compressed audio
int num_sound_effects; // SO3 MP3 compressed audio
+ BundleAudioTable *bundle_table; // DIG/CMI bundles
void pauseSounds(bool pause);
bool isSfxFinished();
void playBundleSound(char *sound);
+ void decompressBundleSound(int index);
int playSfxSound(void *sound, uint32 size, uint rate);
int playSfxSound_MP3(void *sound, uint32 size);
void stopSfxSound();
@@ -1333,13 +1335,21 @@ public:
int fileReadByte();
uint32 fileReadDwordLE();
uint32 fileReadDwordBE();
+ int fileReadByte(void *handle);
+ uint32 fileReadDwordLE(void *handle);
+ uint32 fileReadDwordBE(void *handle);
+
#if defined(SCUMM_LITTLE_ENDIAN)
uint32 fileReadDword() { return fileReadDwordLE(); }
+ uint32 fileReadDword(void *handle) { return fileReadDwordLE(handle); }
#elif defined(SCUMM_BIG_ENDIAN)
uint32 fileReadDword() { return fileReadDwordBE(); }
+ uint32 fileReadDword(void *handle) {return fileReadDwordBE(handle);}
#endif
uint fileReadWordLE();
uint fileReadWordBE();
+ uint fileReadWordLE(void *handle);
+ uint fileReadWordBE(void *handle);
static byte *alloc(int size);
static byte *realloc(void *mem, int size);