X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=310d7b851307e7cb14711736ca18ba00a232b5db;hb=68a47a5b92e7c62a8c8a06391e4f9b8d53eeb82f;hp=ec5a2a8b8c2a0a13d7382cb4a7e5a6dd73dfe72f;hpb=c9433eab5c4317ed4f89164b386a7d33562e29be;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index ec5a2a8b..310d7b85 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -14,7 +14,7 @@ #ifndef SOUND_H #define SOUND_H -#include "platform.h" +#include "system.h" #if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) @@ -114,16 +114,7 @@ #define SOUND_MIDDLE (SOUND_MAX_LEFT2RIGHT / 2) /* value for undefined sound effect filename */ -#define SND_FILE_UNDEFINED "NONE" - - -struct SoundEffectInfo -{ - char *text; - char *default_filename; - - char *filename; -}; +#define SND_FILE_UNDEFINED UNDEFINED_FILENAME /* general sound functions */ @@ -148,7 +139,8 @@ void StopMusic(void); void StopSound(int); void StopSounds(void); void StopSoundExt(int, int); -void InitSoundList(struct SoundEffectInfo *, int); +struct FileInfo *getCurrentSoundList(); +void InitSoundList(struct ConfigInfo *, struct ConfigInfo *, int); void InitReloadSounds(char *); void InitReloadMusic(char *); void FreeAllSounds(void);