codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hooked up new menu music loop.

Browse source
This commit is contained in:
Nick Winter 2014-11-30 14:57:34 -08:00
parent 070d3ec6c2
commit 44282cb946
2 changed files with 4 additions and 5 deletions

3
app/lib/surface/MusicPlayer.coffee
View file

@ -86,8 +86,7 @@ module.exports = class MusicPlayer extends CocoClass
return if @inMenu return if @inMenu
@inMenu = true @inMenu = true
@previousMusic = @currentMusic @previousMusic = @currentMusic
terrain = (e.terrain ? 'Dungeon').toLowerCase() file = "/music/music-menu"
file = "/music/music-menu-#{terrain}"
Backbone.Mediator.publish 'music-player:play-music', file: file, play: true, delay: 1000 Backbone.Mediator.publish 'music-player:play-music', file: file, play: true, delay: 1000
onExitMenu: (e) -> onExitMenu: (e) ->

6
app/views/play/WorldMapView.coffee
View file

@ -63,7 +63,7 @@ module.exports = class WorldMapView extends RootView
@getLevelPlayCounts() @getLevelPlayCounts()
$(window).on 'resize', @onWindowResize $(window).on 'resize', @onWindowResize
@playAmbientSound() @playAmbientSound()
@probablyCachedMusic = storage.load("loaded-menu-music-#{@terrain}") @probablyCachedMusic = storage.load("loaded-menu-music")
musicDelay = if @probablyCachedMusic then 1000 else 10000 musicDelay = if @probablyCachedMusic then 1000 else 10000
@playMusicTimeout = _.delay (=> @playMusic() unless @destroyed), musicDelay @playMusicTimeout = _.delay (=> @playMusic() unless @destroyed), musicDelay
@hadEverChosenHero = me.get('heroConfig')?.thangType @hadEverChosenHero = me.get('heroConfig')?.thangType
@ -280,9 +280,9 @@ module.exports = class WorldMapView extends RootView
playMusic: -> playMusic: ->
@musicPlayer = new MusicPlayer() @musicPlayer = new MusicPlayer()
musicFile = {dungeon: '/music/music-menu-dungeon', forest: '/music/music-menu-grass'}[@terrain] musicFile = '/music/music-menu'
Backbone.Mediator.publish 'music-player:play-music', play: true, file: musicFile Backbone.Mediator.publish 'music-player:play-music', play: true, file: musicFile
storage.save("loaded-menu-music-#{@terrain}", true) unless @probablyCachedMusic storage.save("loaded-menu-music", true) unless @probablyCachedMusic
preloadTopHeroes: -> preloadTopHeroes: ->
for heroID in ['captain', 'knight'] for heroID in ['captain', 'knight']