diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-14 23:47:22 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-14 23:53:26 +0200 |
| commit | beac98b7d093bca0fa921e5e30c2b766fb0298e9 (patch) | |
| tree | 74adb5d59e6bd074a8483d14966ab2913fd50cc1 /data | |
| parent | 2f04d1c1aa1fca06754eb5c8bad631d4fbfab6df (diff) | |
| download | mana-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.gz mana-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.bz2 mana-beac98b7d093bca0fa921e5e30c2b766fb0298e9.tar.xz mana-beac98b7d093bca0fa921e5e30c2b766fb0298e9.zip | |
Cleanup of Sound class, fixing restoring of volumes and music
While a previous commit fixed the restoring of music of the current map
in the setup window, this commit makes sure that the Sound class itself
will resume a previously playing song when it is re-initialized.
Other fixes:
* Restore the correct volumes when enabling sound
* Play the right audio track during login
* Specify which font to use for bold text
Diffstat (limited to 'data')
| -rw-r--r-- | data/branding.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/data/branding.xml b/data/branding.xml index ea3ee467..cb0bc5d9 100644 --- a/data/branding.xml +++ b/data/branding.xml @@ -1,12 +1,12 @@ <?xml version="1.0"?> -<!-- +<!-- Branding information -All values in here are the default values which are hardcoded into the TMW client. -So it would make no difference for the official version when this file is missing. It is -basically an example for developers of tmw forks to help them writing a branding.xml -for their forks. +All values in here are the default values which are hardcoded into the TMW +client. So it would make no difference for the official version when this file +is missing. It is basically an example for developers of TMW forks to help them +writing a branding.xml for their forks. --> <configuration> @@ -14,11 +14,10 @@ for their forks. <option name="appShort" value="tmw"/> <option name="appIcon" value="icons/tmw.png"/> <option name="loginWallpaper" value="graphics/images/login_wallpaper.png"/> - <option name="loginMusic" value="The Mana World - Hurnscald.ogg"/> + <option name="loginMusic" value="Magick - Real.ogg"/> <option name="defaultServer" value="server.themanaworld.org"/> <option name="defaultPort" value="9601"/> <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/> - <option name="guiFont" value="fonts/dejavusans.ttf" /> - <option name="speechFont" value="fonts/dejavusans.ttf" /> - + <option name="font" value="fonts/dejavusans.ttf" /> + <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> </configuration> |