From 2b5b46c5c8bdd5ad8ea45c49c42d8b9f18ab8d32 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sat, 20 Nov 2004 17:52:18 +0000
Subject: [PATCH] Added pseudo-random music playback.

This was SVN commit r1365.
---
 .../data/mods/official/gui/test/1_init.xml    |  3 ++
 .../mods/official/gui/test/2_mainmenu.xml     | 14 ++++--
 .../official/gui/test/functions_utility.js    | 11 +++++
 .../gui/test/functions_utility_music.js       | 48 +++++++++++++++++++
 .../gui/test/functions_utility_object.js      |  2 +
 5 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100755 binaries/data/mods/official/gui/test/functions_utility.js

diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml
index 6e9e972a0a..8b54443e99 100755
--- a/binaries/data/mods/official/gui/test/1_init.xml
+++ b/binaries/data/mods/official/gui/test/1_init.xml
@@ -11,6 +11,9 @@
         -->
 
         <!-- Generic utilities -->
+        <script file="gui/test/functions_utility.js"><![CDATA[
+        ]]></script>
+
         <script file="gui/test/functions_utility_object.js"><![CDATA[
         ]]></script>
 
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 11e0d7e8f7..698cabdc2b 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -13,8 +13,15 @@
     <object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
         <action on="Load"><![CDATA[
                 // Play main 0 A.D. theme when the main menu starts.
-//		curr_music = new Sound("audio/music/menu_track.ogg");
-//		curr_music.loop();
+		curr_music = newRandomSound("music", "theme");
+		curr_music.loop();
+		curr_music.free(); // Close main theme when starting game session.
+		curr_session_playlist_1 = newRandomSound("music", "peace");
+		curr_session_playlist_1.play();
+		curr_session_playlist_1.free();
+		curr_session_playlist_2 = newRandomSound("music", "peace");
+		curr_session_playlist_2.play();
+		curr_session_playlist_2.free();
         ]]></action>
 
         <object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" />
@@ -25,9 +32,6 @@
                 GUIObjectUnhide("session_gui");
                 GUIObjectHide("pregame_gui");
                 FlipGUI(GUIType);
-//		curr_music.free(); // Close main theme when starting game session.
-		curr_session_music = new Sound("audio/music/germanic_peace_2.ogg");
-		curr_session_music.play();
             ]]></action>
             <action on="MouseEnter"><![CDATA[
                 tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
diff --git a/binaries/data/mods/official/gui/test/functions_utility.js b/binaries/data/mods/official/gui/test/functions_utility.js
new file mode 100755
index 0000000000..08b67907d7
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_utility.js
@@ -0,0 +1,11 @@
+function getRandom(randomMin, randomMax)
+{
+	// Returns a random whole number in a min..max range.
+	// NOTE: There should probably be an engine function for this,
+	// since we'd need to keep track of random seeds for replays.
+
+	randomNum = randomMin + (randomMax-randomMin)*Math.random();  // num is random, from A to B 
+	return Math.round(randomNum);
+}
+
+// ====================================================================
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/functions_utility_music.js b/binaries/data/mods/official/gui/test/functions_utility_music.js
index e155874678..3dd9ef3561 100755
--- a/binaries/data/mods/official/gui/test/functions_utility_music.js
+++ b/binaries/data/mods/official/gui/test/functions_utility_music.js
@@ -12,3 +12,51 @@
 
 // Close "s" and free it from memory (use in conjunction with loop()):
 // s.free();
+
+function newRandomSound(soundType, soundSubType)
+{
+	switch (soundType)
+	{
+		case "music":
+			randomSoundPath = "audio/music/"
+			switch (soundSubType)
+			{
+				case "peace":
+					// Get a random number within the sound's range.
+					// (Later we'll need to change this to an array selection of filenames.)
+					randomSound = getRandom(1, 4);
+
+					switch (randomSound)
+					{
+						case 1:
+							randomFileName = "germanic_peace_1.ogg"
+						break;
+						case 2:
+							randomFileName = "germanic_peace_2.ogg"
+						break;
+						case 3:
+							randomFileName = "germanic_peace_3.ogg"
+						break;
+						case 4:
+							randomFileName = "roman_peace_1.ogg"
+						break;
+					}
+				break;
+				case "theme":
+					randomFileName = "menu_track.ogg"
+				break;
+				default:
+				break;
+			}
+		break;
+		default:
+		break;
+	}
+	
+	// Build path to random audio file.
+	randomSoundPath += randomFileName;
+
+	console.write("Playing " + randomSoundPath + " ...");
+
+	return new Sound(randomSoundPath);
+}
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/functions_utility_object.js b/binaries/data/mods/official/gui/test/functions_utility_object.js
index 115e860a6b..4147d7717f 100755
--- a/binaries/data/mods/official/gui/test/functions_utility_object.js
+++ b/binaries/data/mods/official/gui/test/functions_utility_object.js
@@ -27,3 +27,5 @@ function GUIObjectToggle(objectName)
         GUIObject.hidden = !GUIObject.hidden;
 }
 
+// ====================================================================
+