rnd-20020427-3-src

[rocksndiamonds.git] / src / libgame / sound.h

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index ebca45f5eb6be619b2ed1a69998ca7d654ea8dea..63cab3365dd65ca1eaa5337f028f867036dc1416 100644 (file)
--- 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;