From: Jason Woofenden <jason283@herkamire.com>
Date: Tue, 26 May 2009 23:04:36 +0000 (-0400)
Subject: replaced music with original work by Jason Woofenden (public domain)
X-Git-Tag: 0.5.4~11
X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=commitdiff_plain;h=8d9f69072204deab2486967d710477d4d2949754;hp=19f8eb7a835a2b084010a8deb8f3d200f995559d

replaced music with original work by Jason Woofenden (public domain)
---

diff --git a/Makefile b/Makefile
index 840adfe..c7f6941 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ install-program: program
 install-data: data
 	$(INSTALL_DATA) ./data/*.png $(DATA_PREFIX)/
 	$(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
-	$(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
+	$(INSTALL_DATA) ./data/*.xm $(DATA_PREFIX)/
 	@echo
 	@echo "$(DATA_PREFIX)/icon.png (48x48) or ship.png (32x32) make good icons."
 	@echo
@@ -130,4 +130,4 @@ uninstall-program:
 uninstall-data:
 	rm -f $(DATA_PREFIX)/*.png
 	rm -f $(DATA_PREFIX)/*.wav
-	rm -f $(DATA_PREFIX)/*.mod
+	rm -f $(DATA_PREFIX)/*.xm
diff --git a/README b/README
index 5fc8451..0dd93b1 100644
--- a/README
+++ b/README
@@ -17,7 +17,8 @@ Arrows: Steer (use short taps, and remember to slow down)
 
 See INSTALL for instructions on building, running and installing.
 
-VoR is released under the GNU GPL -- see file COPYING for details.
+VoR is released under the GNU GPL -- see file COPYING for details. The audio is
+public domain.
 
 Jason Woofenden and Josh Grams like Rock Dodgers
 (http://spacerocks.sourceforge.net/) very much: both playing it and hacking on
diff --git a/data/4est_fulla3s.mod b/data/4est_fulla3s.mod
deleted file mode 100644
index f84b409..0000000
Binary files a/data/4est_fulla3s.mod and /dev/null differ
diff --git a/data/getzznew.mod b/data/getzznew.mod
deleted file mode 100644
index 533f882..0000000
Binary files a/data/getzznew.mod and /dev/null differ
diff --git a/data/magic.mod b/data/magic.mod
deleted file mode 100644
index 46c7b02..0000000
Binary files a/data/magic.mod and /dev/null differ
diff --git a/data/mph.xm b/data/mph.xm
new file mode 100644
index 0000000..5b042ef
Binary files /dev/null and b/data/mph.xm differ
diff --git a/sound.c b/sound.c
index 471808e..70ef8e1 100644
--- a/sound.c
+++ b/sound.c
@@ -11,7 +11,7 @@
 
 
 static Mix_Music *music[NUM_TUNES];
-static int music_volume[NUM_TUNES] = {88,88,88};
+static int music_volume[NUM_TUNES] = {255};
 static Mix_Chunk *wav[NUM_SOUNDS];
 
 int audio_rate;
@@ -24,9 +24,7 @@ char *wav_file[] = {
 };
 
 char *tune_file[] = {
-	"magic.mod",
-	"getzznew.mod",
-	"4est_fulla3s.mod"
+	"mph.xm"
 };
 
 // Return 1 if the sound is ready to roll, and 0 if not.
@@ -69,7 +67,7 @@ play_sound(int i)  {
 	Mix_PlayChannel(-1, wav[i], 0);
 }
 
-int playing=-1;
+int playing = NUM_TUNES + 1;
 
 
 void
@@ -80,11 +78,12 @@ play_tune(int i) {
 	if (playing == i) {
 		return;
 	}
-	if (playing) {
+	if (playing < NUM_TUNES) {
 		Mix_FadeOutMusic(2500);
 	}
-	if(i == TUNE_GAMEPLAY) {
-		Mix_FadeInMusic(music[i],-1,2000);
+	// There are songs yet to be written...
+	if(i < NUM_TUNES) {
+		Mix_FadeInMusic(music[i], -1, 2000);
 		Mix_VolumeMusic(music_volume[i]);
 	}
 
@@ -99,7 +98,7 @@ pause_tune() {
 	if(!opt_sound) {
 		return;
 	}
-	if(playing == TUNE_GAMEPLAY && !tune_paused) {
+	if(playing < NUM_TUNES && !tune_paused) {
 		Mix_PauseMusic();
 		tune_paused = 1;
 	}
@@ -110,7 +109,7 @@ resume_tune() {
 	if(!opt_sound) {
 		return;
 	}
-	if(playing == TUNE_GAMEPLAY && tune_paused) {
+	if(playing < NUM_TUNES && tune_paused) {
 		Mix_ResumeMusic();
 		tune_paused = 0;
 	}
diff --git a/sound.h b/sound.h
index 8d5dcee..39f04ef 100644
--- a/sound.h
+++ b/sound.h
@@ -25,12 +25,15 @@ void play_tune(int i);
 void pause_tune();
 void resume_tune();
 
-#define TUNE_TITLE_PAGE		0
-#define TUNE_GAMEPLAY		1
-#define TUNE_HIGH_SCORE_ENTRY	2
-#define NUM_TUNES		3
+// Currently there's only one tune (gameplay). Calling play_tune() with the
+// other tune numbers turns the music off, (and makes it easy to add tunes for
+// those screens).
+#define TUNE_GAMEPLAY 0
+#define TUNE_TITLE_PAGE 1
+#define TUNE_HIGH_SCORE_ENTRY 2
+#define NUM_TUNES 1
 
-#define SOUND_BANG		0
-#define NUM_SOUNDS		1
+#define SOUND_BANG 0
+#define NUM_SOUNDS 1
 
 #endif // VOR_SOUND_H