X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sound.c;h=16f3d607c0ed65de60bacdd2666b09091c5ae81f;hp=3794bef559e573b2bb9279b347dd98ca1395d6df;hb=3079660eb1f60a861b677b746da581c4c0e6c3dd;hpb=af711b4e66c96c112086a442ea09094643bd8d71

diff --git a/sound.c b/sound.c
index 3794bef..16f3d60 100644
--- a/sound.c
+++ b/sound.c
@@ -1,5 +1,5 @@
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -20,16 +20,16 @@ int audio_channels;
 
 char *add_data_path(char *);
 char *wav_file[] = {
-	"sounds/booom.wav",
-	"sounds/cboom.wav",
-	"sounds/boom.wav",
-	"sounds/bzboom.wav"
+	"booom.wav",
+	"cboom.wav",
+	"boom.wav",
+	"bzboom.wav"
 };
 
 char *tune_file[] = {
-	"music/magic.mod",
-	"music/getzznew.mod",
-	"music/4est_fulla3s.mod"
+	"magic.mod",
+	"getzznew.mod",
+	"4est_fulla3s.mod"
 };
 
 // Return 1 if the sound is ready to roll, and 0 if not.
@@ -70,14 +70,14 @@ void
 play_sound(int i)  {
 	if(!opt_sound) return;
 	Mix_PlayChannel(-1, wav[i], 0);
-}/*}}}*/
+}
 
 int playing=-1;
 
 
 void
-play_tune(int i) {/*{{{*/
-	if(!opt_music) return;
+play_tune(int i) {
+	if(!opt_sound) return;
 	if (playing==i)
 	return;
 	if (playing) {