-#define SSND_FADE_SOUND (1<<0)
-#define SSND_FADE_ALL_SOUNDS (1<<1)
-#define SSND_FADING(x) (x & (SSND_FADE_SOUND | SSND_FADE_ALL_SOUNDS))
-#define SSND_STOP_SOUND (1<<2)
-#define SSND_STOP_ALL_SOUNDS (1<<3)
-#define SSND_STOPPING(x) (x & (SSND_STOP_SOUND | SSND_STOP_ALL_SOUNDS))
-#define SSND_ALL(x) (x&(SSND_FADE_ALL_SOUNDS|SSND_STOP_ALL_SOUNDS))
+#define PSND_NO_LOOP 0
+#define PSND_LOOP 1
+#define PSND_MUSIC 2
+
+#define SSND_FADE_SOUND (1 << 0)
+#define SSND_FADE_MUSIC (1 << 1)
+#define SSND_FADE_ALL (1 << 2)
+#define SSND_FADING (SSND_FADE_SOUND | \
+ SSND_FADE_MUSIC | \
+ SSND_FADE_ALL)
+#define SSND_STOP_SOUND (1 << 3)
+#define SSND_STOP_MUSIC (1 << 4)
+#define SSND_STOP_ALL (1 << 5)
+#define SSND_STOPPING (SSND_STOP_SOUND | \
+ SSND_STOP_MUSIC | \
+ SSND_STOP_ALL)
+#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
+
+#define MUS_TYPE_NONE 0
+#define MUS_TYPE_WAV 1
+#define MUS_TYPE_MOD 2