X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=63cab3365dd65ca1eaa5337f028f867036dc1416;hb=8c373c85183bd059717b0a53ffb97dd472bd6741;hp=ebca45f5eb6be619b2ed1a69998ca7d654ea8dea;hpb=ae0910c3223faf69f7638780ff8e49cf08bbb554;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index ebca45f5..63cab336 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -92,7 +92,7 @@ #if !defined(PLATFORM_MSDOS) #define PSND_SILENCE 0 -#define PSND_MAX_VOLUME_BITS 7 +#define PSND_MAX_VOLUME_BITS 15 #define PSND_MIN_VOLUME 0 #define PSND_MAX_VOLUME (1 << PSND_MAX_VOLUME_BITS) #define PSND_MIDDLE 0 @@ -181,12 +181,11 @@ struct SoundHeader_8SVX struct SampleInfo { - char *source_filename; - int type; + char *source_filename; - void *data_ptr; long data_len; + void *data_ptr; }; typedef struct SampleInfo SoundInfo; @@ -210,8 +209,8 @@ struct SoundControl int playingtime; long playingpos; - unsigned long data_len; - byte *data_ptr; + long data_len; + void *data_ptr; #if defined(PLATFORM_MSDOS) int voice;