X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=63cab3365dd65ca1eaa5337f028f867036dc1416;hb=8c373c85183bd059717b0a53ffb97dd472bd6741;hp=896bef06971a5f2ee3f4fb9886ea688e4a577983;hpb=1101077a226b09854650662759bf12caf7c84f8d;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 896bef06..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
@@ -133,6 +133,9 @@
 #define SSND_MUSIC		(SSND_FADE_MUSIC | SSND_STOP_MUSIC)
 #define SSND_ALL		(SSND_FADE_ALL | SSND_STOP_ALL)
 
+#define SND_RELOAD_SOUNDS	1
+#define SND_RELOAD_MUSIC	2
+
 #define SND_TYPE_NONE		0
 #define SND_TYPE_WAV		1
 
@@ -178,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;
@@ -208,7 +210,7 @@ struct SoundControl
   long playingpos;
 
   long data_len;
-  byte *data_ptr;
+  void *data_ptr;
 
 #if defined(PLATFORM_MSDOS)
   int voice;
@@ -225,8 +227,8 @@ void StartSoundserver(void);
 void SoundServer(void);
 
 /* sound client functions */
-void ReloadSounds(void);
-void ReloadMusic(void);
+void ReloadSounds(char *);
+void ReloadMusic(char *);
 SoundInfo *LoadCustomSound(char *);
 void InitSoundList(int);
 void LoadSoundToList(char *, int);