diff --git a/binaries/data/mods/public/gui/common/music.js b/binaries/data/mods/public/gui/common/music.js index fbde47b259..ca74a7dec4 100644 --- a/binaries/data/mods/public/gui/common/music.js +++ b/binaries/data/mods/public/gui/common/music.js @@ -67,7 +67,7 @@ Music.prototype.update = function() switch (this.currentState) { case this.states.OFF: - if (this.isMusicPlaying()) + if (this.isPlaying()) { this.currentMusic.fade(-1, 0.0, 3.0); this.currentMusic = null; @@ -76,7 +76,6 @@ Music.prototype.update = function() case this.states.MENU: this.switchMusic(this.tracks.MAIN_MENU_TRACK, 0.0, true); - console.write("menu"); break; case this.states.PEACE: @@ -106,7 +105,7 @@ Music.prototype.update = function() break; } } -// else if (!this.isMusicPlaying()) +// else if (!this.isPlaying()) // { // // } @@ -173,7 +172,7 @@ Music.prototype.switchMusic = function(track, fadeInPeriod, isLooping) } }; -Music.prototype.isMusicPlaying = function() +Music.prototype.isPlaying = function() { if (!this.currentMusic) return false; @@ -185,12 +184,12 @@ Music.prototype.isMusicPlaying = function() return true; }; -Music.prototype.startMusic = function() +Music.prototype.start = function() { this.setState(this.states.PEACE); }; -Music.prototype.stopMusic = function() +Music.prototype.stop = function() { this.setState(this.states.OFF); }; diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js index 4ff70a110b..bf31c2bb1e 100644 --- a/binaries/data/mods/public/gui/session/menu.js +++ b/binaries/data/mods/public/gui/session/menu.js @@ -33,7 +33,7 @@ const INITIAL_MENU_POSITION = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM; // distance is the max-initial. The travel distance in this // example is 164-0 = 164. We choose an offset of 10.25 because it // divides into 164 evenly and provided the speed we wanted. -const OFFSET = 10.25; +const OFFSET = 20.5; var isMenuOpen = false; var menu; diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml index 6d8f3d9e5f..4605639cd7 100644 --- a/binaries/data/mods/public/gui/session/session.xml +++ b/binaries/data/mods/public/gui/session/session.xml @@ -234,7 +234,7 @@ Enable Music - if (this.checked) startMusic(); else stopMusic(); + if (this.checked) global.music.start(); else global.music.stop();