# HG changeset patch
# User sheepluva
# Date 1461928346 -7200
# Node ID 927c45b83496ba60e174d22eed05f2dd0b0d0abc
# Parent  c9da8046f618fd0c23826cbb02f10229dad78160
music credits etc.

diff -r c9da8046f618 -r 927c45b83496 CREDITS
--- a/CREDITS	Fri Apr 29 12:26:13 2016 +0200
+++ b/CREDITS	Fri Apr 29 13:12:26 2016 +0200
@@ -57,6 +57,7 @@
 - Stanko Tadić <stanko@mfhinc.net> -> Hell (2008)
 - Julien Koesten <julienkoesten@aol.com> -> Sheep (2008)
 - KoRn666 - Jungle (2010)
+- Randy Broda -> Fruit (2013), Cake (2014)
 
 ==========
 = VOICES
diff -r c9da8046f618 -r 927c45b83496 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas	Fri Apr 29 12:26:13 2016 +0200
+++ b/hedgewars/hwengine.pas	Fri Apr 29 13:12:26 2016 +0200
@@ -66,9 +66,6 @@
         themeCredits:= read1stLn(cPathz[ptCurrTheme] + '/credits.txt');
         if Length(themeCredits) > 0 then
             AddChatString(char(8) + '© Theme: ' + themeCredits);
-
-        //AddChatString(char(9) + '© Hats : TODO');
-        //AddChatString(char(2) + '© Music : TODO');
 end;
 
 ///////////////////////////////////////////////////////////////////////////////
diff -r c9da8046f618 -r 927c45b83496 hedgewars/uSound.pas
--- a/hedgewars/uSound.pas	Fri Apr 29 12:26:13 2016 +0200
+++ b/hedgewars/uSound.pas	Fri Apr 29 13:12:26 2016 +0200
@@ -110,7 +110,7 @@
 var Volume: LongInt;
     SoundTimerTicks: Longword;
 implementation
-uses uVariables, uConsole, uCommands, uDebug, uPhysFSLayer;
+uses uVariables, uConsole, uCommands, uChat, uUtils, uDebug, uPhysFSLayer;
 
 const chanTPU = 32;
 var cInitVolume: LongInt;
@@ -581,6 +581,11 @@
     SDLCheck(Mus <> nil, 'Mix_LoadMUS_RW', false);
     WriteLnToConsole(msgOK);
 
+    // display music credits
+    s:= read1stLn(s + '_credits.txt');
+    if Length(s) > 0 then
+        AddChatString(char(2) + '© Music: ' + s);
+
     SDLCheck(Mix_FadeInMusic(Mus, -1, 3000) <> -1, 'Mix_FadeInMusic', false)
 end;
 
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Music/CMakeLists.txt
--- a/share/hedgewars/Data/Music/CMakeLists.txt	Fri Apr 29 12:26:13 2016 +0200
+++ b/share/hedgewars/Data/Music/CMakeLists.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -1,5 +1,7 @@
 file(GLOB BaseMusic *.ogg)
+file(GLOB MusicCredits *_credits.txt)
 
 install(FILES
     ${BaseMusic}
+    ${MusicCredits}
     DESTINATION ${SHAREPATH}Data/Music)
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Music/oriental.ogg_credits.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Music/oriental.ogg_credits.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -0,0 +1,1 @@
+Jonatan Nilsson
\ No newline at end of file
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Music/sdmusic.ogg_credits.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Music/sdmusic.ogg_credits.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -0,0 +1,1 @@
+Kevin MacLeod - "Hitman" [sheepluva edit]
\ No newline at end of file
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Music/snow.ogg_credits.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Music/snow.ogg_credits.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -0,0 +1,1 @@
+Jonatan Nilsson
\ No newline at end of file
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Themes/Cake/CMakeLists.txt
--- a/share/hedgewars/Data/Themes/Cake/CMakeLists.txt	Fri Apr 29 12:26:13 2016 +0200
+++ b/share/hedgewars/Data/Themes/Cake/CMakeLists.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -3,4 +3,5 @@
 install(FILES
     theme.cfg
     ${images}
+    credits.txt
     DESTINATION ${SHAREPATH}Data/Themes/Cake)
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Themes/Cake/credits.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Cake/credits.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -0,0 +1,1 @@
+Randy
\ No newline at end of file
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Themes/Fruit/CMakeLists.txt
--- a/share/hedgewars/Data/Themes/Fruit/CMakeLists.txt	Fri Apr 29 12:26:13 2016 +0200
+++ b/share/hedgewars/Data/Themes/Fruit/CMakeLists.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -3,4 +3,5 @@
 install(FILES
     theme.cfg
     ${images}
+    credits.txt
     DESTINATION ${SHAREPATH}Data/Themes/Fruit)
diff -r c9da8046f618 -r 927c45b83496 share/hedgewars/Data/Themes/Fruit/credits.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Themes/Fruit/credits.txt	Fri Apr 29 13:12:26 2016 +0200
@@ -0,0 +1,1 @@
+Randy
\ No newline at end of file