A music table from original demo exes.

svn-id: r12595

1 files changed, 172 insertions, 29 deletions

diff --git a/queen/musicdata.cpp b/queen/musicdata.cpp
index 0a6ac1676b..e63877e90d 100644
--- a/queen/musicdata.cpp
+++ b/queen/musicdata.cpp
@@ -26,61 +26,97 @@ namespace Queen {
 
 const songData Sound::_songDemo[] = {
 	/* 1 - Hotel Gangsters */
-	{ { 1, 0 }, 128, 180, 0, 1, 0 }, 
+	{ { 1, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 2 - Arrive Hotel */
-	{ { 42, 0 }, 128, 0, 0, 1, 0 },
+	/* 2 - Hotel General */
+	{ { 2, 0 }, 128, 128, 128, 1, 0 }, 
 
 	/* 3 - Jungle */
-	{ { 3, 4, 5, 6, 0 }, 128, 0, 0, 1, 0 }, 
+	{ { 3, 4, 5, 6, 0 }, 128, 128, 128, 1, 0 }, 
 
 	/* 4 - Waterfall On */
-	{ { 7, 0 }, 128, 0, 0, 0, 0 }, 
+	{ { 7, 0 }, 128, 128, 128, 0, 0 }, 
 
 	/* 5 - Vnormal */
-	{ { 8, 0 }, 128, 0, 0, 2, 0 }, 
+	{ { 8, 0 }, 128, 128, 128, 2, 0 }, 
 
-	/* 6 - Bells? */
-	{ { 9, 0 }, 120, 0, 0, 1, 0 }, 
+	/* 6 - Trader Bob */
+	{ { 9, 0 }, 120, 128, 128, 1, 0 }, 
 
 	/* 7 - Jetty Music */
-	{ { 10, 0 }, 128, 0, 0, 1, 0 }, 
+	{ { 10, 0 }, 128, 128, 128, 1, 0 }, 
 
 	/* 8 - Ferry Music */
-	{ { 11, 0 }, 128, 0, 0, 1, 0 }, 
+	{ { 11, 0 }, 128, 128, 128, 1, 0 }, 
 
 	/* 9 - Temple Upstairs */
-	{ { 12, 0 }, 128, 0, 0, 1, 0 }, 
+	{ { 12, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 10 - NULL */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 10 - Temple Downstairs */
+	{ { 13, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 11 - NULL */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 11 - Temple Maze */
+	{ { 14, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 12 - NULL */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 12 - Temple Skull */
+	{ { 15, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 13 - NULL */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 13 - Johns Theme (Love Story) */
+	{ { 16, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 14 - Unknown */
-	{ { 17, 0 }, 120, 0, 0, 2, 0 }, 
+	/* 14 - Vmedium */
+	{ { 17, 0 }, 128, 128, 0, 2, 0 }, 
 
-	/* 15 - Unknown */
-	{ { 18, 0 }, 110, 0, 0, 2, 0 }, 
+	/* 15 - Vsoft */
+	{ { 18, 0 }, 128, 128, 0, 2, 0 }, 
 
 	/* 16 - Floda Upstairs */
-	{ { 19, 0 }, 110, 0, 0, 1, 0 }, 
+	{ { 19, 0 }, 128, 128, 0, 1, 0 }, 
 
-	/* 17 - Floda Lab */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 17 - Floda General */
+	{ { 20, 0 }, 128, 128, 128, 1, 0 }, 
 
-	/* 18 - NULL */
-	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+	/* 18 - Klunks Room */
+	{ { 21, 0 }, 110, 128, 128, 1, 0 }, 
 
 	/* 19 - Hotel Lola */
-	{ { 22, 0 }, 120, 180, 0, 1, 0 }, 
+	{ { 22, 0 }, 120, 18128, 128, 1, 0 }, 
+
+	/* 20 - Hotel Escape 1 */
+	{ { 23, 0 }, 128, 18128, 128, 1, 0 }, 
+
+	/* 21 - Amazon Fortress */
+	{ { 24, 0 }, 128, 128, 128, 1, 0 }, 
+
+	/* 22 - Waterfall Off */
+	{ { 25, 0 }, 128, 128, 128, 0, 0 }, 
+
+	/* 23 - Wave Torch */
+	{ { 26, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 24 - Zombies Rez Out */
+	{ { 27, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 25 - Open Door (standard) */
+	{ { 28, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 26 - Close Door (standard) */
+	{ { 29, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 27 - Cloth Unrolls */
+	{ { 30, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 28 - Snake Slithers Off */
+	{ { 31, 0 }, 128, 128, 128, 0, 1 }, 
+
+	/* 29 - Hotel Fanfare 2 */
+	{ { 32, 0 }, 128, 128, 128, 1, 1 }, 
+
+	/* 30 - Floda Secret */
+	{ { 33, 0 }, 120, 128, 128, 1, 0 }, 
+
+	/* 31 - Temple Fanfare 1 */
+	{ { 34, 0 }, 128, 128, 128, 1, 1 }, 
 };
 
 const songData Sound::_song[] = {
@@ -712,6 +748,113 @@ const songData Sound::_song[] = {
 	{ { 212, 0 }, 128, 128, 128, 1, 0 }
 };
 
+const tuneData Sound::_tuneDemo[] = {
+	/* 1 - Hotel Gangsters */
+	{ { 32, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 2 - Hotel General */
+	{ { 26, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 3 - Jungle */
+	{ { 15, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 4 - Jungle */
+	{ { 17, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 5 - Jungle */
+	{ { 18, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 6 - Jungle */
+	{ { 7, 8, 9, 10, 11, 12, 13, 14, 0 }, { 0, 0 }, 0, 0 }, 
+
+	/* 7 - Waterfall On */
+	{ { 3, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 8 - Vnormal */
+	{ { 1, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 9 - Trader Bob */
+	{ { 1, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 10 - Jetty Music */
+	{ { 37, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 11 - Ferry Music */
+	{ { 38, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 12 - Temple Upstairs */
+	{ { 30, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 13 - Temple Downstairs */
+	{ { 34, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 14 - Temple Maze */
+	{ { 35, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 15 - Temple Skull */
+	{ { 36, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 16 - Johns Theme (Love Story) */
+	{ { 43, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 17 - Vmedium */
+	{ { 28, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 18 - Vsoft */
+	{ { 28, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 19 - Floda Upstairs */
+	{ { 28, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 20 - Floda General */
+	{ { 29, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 21 - Klunks Room */
+	{ { 39, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 22 - Hotel Lola */
+	{ { 31, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 23 - Hotel Escape 1 */
+	{ { 33, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 24 - Amazon Fortress */
+	{ { 40, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 25 - Waterfall Off */
+	{ { -3, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 26 - Wave Torch */
+	{ { 22, 0 }, { 121, 0 }, 2, 0 }, 
+
+	/* 27 - Zombies Rez Out */
+	{ { 25, 0 }, { 20, 0 }, 2, 0 }, 
+
+	/* 28 - Open Door (standard) */
+	{ { 20, 0 }, { 1, 0 }, 2, 0 }, 
+
+	/* 29 - Close Door (standard) */
+	{ { 21, 0 }, { 2, 0 }, 2, 0 }, 
+
+	/* 30 - Cloth Unrolls */
+	{ { 23, 0 }, { 51, 0 }, 2, 0 }, 
+
+	/* 31 - Snake Slithers Off */
+	{ { 24, 0 }, { 122, 0 }, 2, 0 }, 
+
+	/* 32 - Hotel Fanfare 2 */
+	{ { 69, 1003, 0 }, { 0, 0 }, 2, 0 }, 
+
+	/* 33 - Floda Secret */
+	{ { 28, 0 }, { 0, 0 }, 1, 0 }, 
+
+	/* 34 - Temple Fanfare 1 */
+	{ { 60, 162, 0 }, { 0, 0 }, 2, 0 }, 
+
+	/* 35 - Commander Rocket 1 */
+	{ { 46, 0 }, { 0, 0 }, 1, 0 }, 
+};
+
 const tuneData Sound::_tune[] = {
 	/* 1 - Hotel Gangsters */
 	{ { 32, 0 }, { 0, 0 }, 1, 0 },