summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-15 01:34:19 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-15 01:34:19 +0300
commit6472806c41b800e2d79fb2440e4681dd7d7668ee (patch)
tree1b5cb37d93ea478337f22a701b1f0cb556339e69
parentbce94fcdf18b2667fffdb4262bfc0ffbf5be49fe (diff)
downloadplus-6472806c41b800e2d79fb2440e4681dd7d7668ee.tar.gz
plus-6472806c41b800e2d79fb2440e4681dd7d7668ee.tar.bz2
plus-6472806c41b800e2d79fb2440e4681dd7d7668ee.tar.xz
plus-6472806c41b800e2d79fb2440e4681dd7d7668ee.zip
Add default music. Track named Këphrom by Obani.
-rwxr-xr-xconfigure.ac1
-rw-r--r--data/CMakeLists.txt1
-rw-r--r--data/Makefile.am2
-rw-r--r--data/music/CMakeLists.txt5
-rw-r--r--data/music/Makefile.am8
-rw-r--r--packaging/windows/evol.nsi3
-rw-r--r--packaging/windows/setup.nsi3
-rw-r--r--packaging/windows/tmw.nsi3
-rw-r--r--src/client.cpp2
-rw-r--r--src/defaults.cpp2
10 files changed, 27 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d1e7cfdde..7224ca9dd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -515,6 +515,7 @@ data/help/Makefile
data/help/idx/Makefile
data/help/tips/Makefile
data/icons/Makefile
+data/music/Makefile
data/perserver/Makefile
data/perserver/default/Makefile
data/translations/Makefile
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e6e536623..1fd6e8379 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -4,6 +4,7 @@ ADD_SUBDIRECTORY(fonts)
ADD_SUBDIRECTORY(graphics)
ADD_SUBDIRECTORY(help)
ADD_SUBDIRECTORY(icons)
+ADD_SUBDIRECTORY(music)
ADD_SUBDIRECTORY(perserver)
ADD_SUBDIRECTORY(sfx)
ADD_SUBDIRECTORY(test)
diff --git a/data/Makefile.am b/data/Makefile.am
index 1291a85b0..794e67b8f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = evol fonts graphics help icons perserver sfx test themes tmw translations
+SUBDIRS = evol fonts graphics help icons music perserver sfx test themes tmw translations
EXTRA_DIST = CMakeLists.txt items.xsd
diff --git a/data/music/CMakeLists.txt b/data/music/CMakeLists.txt
new file mode 100644
index 000000000..d64d69823
--- /dev/null
+++ b/data/music/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET(FILES
+ keprohm.ogg
+ )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/music)
diff --git a/data/music/Makefile.am b/data/music/Makefile.am
new file mode 100644
index 000000000..999b2b344
--- /dev/null
+++ b/data/music/Makefile.am
@@ -0,0 +1,8 @@
+
+musicdir = $(pkgdatadir)/data/music
+
+music_DATA = keprohm.ogg
+
+EXTRA_DIST = \
+ $(music_DATA) \
+ CMakeLists.txt
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index 9cc7f1adc..0c8891a7a 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -224,6 +224,7 @@ Section "Core files (required)" SecCore
CreateDirectory "$INSTDIR\data\help\idx"
CreateDirectory "$INSTDIR\data\help\tips"
CreateDirectory "$INSTDIR\data\icons"
+ CreateDirectory "$INSTDIR\data\music"
CreateDirectory "$INSTDIR\data\perserver"
CreateDirectory "$INSTDIR\data\perserver\default"
CreateDirectory "$INSTDIR\data\graphics\badges"
@@ -335,6 +336,8 @@ Section "Core files (required)" SecCore
File "${SRCDIR}\data\help\idx\*.idx"
SetOutPath "$INSTDIR\data\icons\"
File "${SRCDIR}\data\icons\manaplus.ico"
+ SetOutPath "$INSTDIR\data\music\"
+ File "${SRCDIR}\data\music\*.ogg"
SetOutPath "$INSTDIR\data\perserver\default\"
File "${SRCDIR}\data\perserver\default\*.txt"
File "${SRCDIR}\data\perserver\default\*.xml"
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 502b11b59..b861d6a3c 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -221,6 +221,7 @@ Section "Core files (required)" SecCore
CreateDirectory "$INSTDIR\data\help\idx"
CreateDirectory "$INSTDIR\data\help\tips"
CreateDirectory "$INSTDIR\data\icons"
+ CreateDirectory "$INSTDIR\data\music"
CreateDirectory "$INSTDIR\data\perserver"
CreateDirectory "$INSTDIR\data\perserver\default"
CreateDirectory "$INSTDIR\data\graphics\badges"
@@ -332,6 +333,8 @@ Section "Core files (required)" SecCore
File "${SRCDIR}\data\help\idx\*.idx"
SetOutPath "$INSTDIR\data\icons\"
File "${SRCDIR}\data\icons\manaplus.ico"
+ SetOutPath "$INSTDIR\data\music"
+ File "${SRCDIR}\data\music\*.ogg"
SetOutPath "$INSTDIR\data\perserver\default\"
File "${SRCDIR}\data\perserver\default\*.txt"
File "${SRCDIR}\data\perserver\default\*.xml"
diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi
index 8c0570c97..24345c35d 100644
--- a/packaging/windows/tmw.nsi
+++ b/packaging/windows/tmw.nsi
@@ -224,6 +224,7 @@ Section "Core files (required)" SecCore
CreateDirectory "$INSTDIR\data\help\idx"
CreateDirectory "$INSTDIR\data\help\tips"
CreateDirectory "$INSTDIR\data\icons"
+ CreateDirectory "$INSTDIR\data\music"
CreateDirectory "$INSTDIR\data\perserver"
CreateDirectory "$INSTDIR\data\perserver\default"
CreateDirectory "$INSTDIR\data\graphics\badges"
@@ -335,6 +336,8 @@ Section "Core files (required)" SecCore
File "${SRCDIR}\data\help\idx\*.idx"
SetOutPath "$INSTDIR\data\icons\"
File "${SRCDIR}\data\icons\manaplus.ico"
+ SetOutPath "$INSTDIR\data\music"
+ File "${SRCDIR}\data\music\*.ogg"
SetOutPath "$INSTDIR\data\perserver\default\"
File "${SRCDIR}\data\perserver\default\*.txt"
File "${SRCDIR}\data\perserver\default\*.xml"
diff --git a/src/client.cpp b/src/client.cpp
index e9e1e96c6..3028bd16b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -555,7 +555,7 @@ void Client::initSoundManager()
}
soundManager.playMusic(branding.getValue(
"loginMusic",
- "Magick - Real.ogg"),
+ "keprohm.ogg"),
SkipError_true);
}
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 8a0a1c103..2a6d96cb5 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -443,7 +443,7 @@ DefaultsData* getBrandingDefaults()
AddDEF("wallpapersFile", "");
AddDEF("appName", "ManaPlus");
AddDEF("appIcon", "icons/manaplus");
- AddDEF("loginMusic", "Magick - Real.ogg");
+ AddDEF("loginMusic", "keprohm.ogg");
AddDEF("defaultServer", "");
AddDEF("defaultPort", DEFAULT_PORT);
AddDEF("defaultServerType", "tmwathena");