X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsound.h;h=ca1e26a6009dc1cc98750396cb2ac7ea2de89299;hb=8cea50fbd1b74a2bc164a79cbd26bdbb3abd6689;hp=b4bcafcf81921f0c354cb0424c1e972affccf956;hpb=3607ef8e4000754063935d908053d564de92c0a2;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index b4bcafcf..ca1e26a6 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -102,6 +102,10 @@ SND_CTRL_RELOAD_MUSIC)) #define ALL_SOUNDS(x) ((x).state & SND_CTRL_ALL_SOUNDS) +#define MAP_NOCONF_MUSIC(x) (-((x) + 1)) +#define UNMAP_NOCONF_MUSIC(x) MAP_NOCONF_MUSIC(x) + + #define SOUND_MIN_VOLUME 0 #if defined(TARGET_SDL) #define SOUND_MAX_VOLUME SDL_MIX_MAXVOLUME @@ -149,9 +153,9 @@ int getSoundListPropertyMappingSize(); int getMusicListPropertyMappingSize(); struct PropertyMapping *getSoundListPropertyMapping(); struct PropertyMapping *getMusicListPropertyMapping(); -void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *, +void InitSoundList(struct ConfigInfo *, int, struct ConfigTypeInfo *, char **, char **, char **, char **, char **); -void InitMusicList(struct ConfigInfo *, int, struct ConfigInfo *, +void InitMusicList(struct ConfigInfo *, int, struct ConfigTypeInfo *, char **, char **, char **, char **, char **); void InitReloadCustomSounds(char *); void InitReloadCustomMusic(char *);