From b1d98cff0447837c62f73d773f3f0abea9a9cb30 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Thu, 15 Sep 2011 05:19:36 +0000 Subject: [PATCH] Fixes in-game music playing (assume filename always contains ogg extension). Fixes #956. This was SVN commit r10285. --- binaries/data/mods/public/gui/common/music.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/gui/common/music.js b/binaries/data/mods/public/gui/common/music.js index 73f7299994..832f3794a7 100644 --- a/binaries/data/mods/public/gui/common/music.js +++ b/binaries/data/mods/public/gui/common/music.js @@ -25,10 +25,10 @@ function Music() this.MUSIC_BATTLE = "battle"; this.tracks = { - MAIN_MENU_TRACK : "main_menu", - VICTORY_TRACK : "win_1", - DEFEAT_TRACK : "gen_loss_track", - DEFEAT_CUE_TRACK : "gen_loss_cue" + MAIN_MENU_TRACK : "main_menu.ogg", + VICTORY_TRACK : "win_1.ogg", + DEFEAT_TRACK : "gen_loss_track.ogg", + DEFEAT_CUE_TRACK : "gen_loss_cue.ogg" }; this.states = { @@ -152,7 +152,7 @@ Music.prototype.switchMusic = function(track, fadeInPeriod, isLooping) this.currentMusic = null; } - this.currentMusic = new Sound(this.RELATIVE_MUSIC_PATH + track + ".ogg"); + this.currentMusic = new Sound(this.RELATIVE_MUSIC_PATH + track); if (this.currentMusic) {