mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-14 07:00:01 -04:00
A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button.
This commit is contained in:
parent
05b53fa10e
commit
3ad67130c7
3 changed files with 3 additions and 2 deletions
|
@ -104,7 +104,6 @@ class AudioPlayer extends CocoClass
|
|||
|
||||
hasLoadedSound: (filename, name) ->
|
||||
return false unless filename of cache
|
||||
console.info 'has loaded sound? well it is in the cache...', filename, name
|
||||
return false unless createjs.Sound.loadComplete filename
|
||||
true
|
||||
|
||||
|
|
|
@ -250,11 +250,13 @@ module.exports = class ThangType extends CocoModel
|
|||
stage.update()
|
||||
stage.startTalking = ->
|
||||
sprite.gotoAndPlay 'portrait'
|
||||
return # TODO: causes infinite recursion in new EaselJS
|
||||
return if @tick
|
||||
@tick = (e) => @update(e)
|
||||
createjs.Ticker.addEventListener 'tick', @tick
|
||||
stage.stopTalking = ->
|
||||
sprite.gotoAndStop 'portrait'
|
||||
return # TODO: just breaks in new EaselJS
|
||||
@update()
|
||||
createjs.Ticker.removeEventListener 'tick', @tick
|
||||
@tick = null
|
||||
|
|
|
@ -347,5 +347,5 @@
|
|||
#item-details-body
|
||||
left: 648px
|
||||
|
||||
#selected-item-unlock-button
|
||||
#selected-item-unlock-button, .unequippable
|
||||
left: 645px
|
||||
|
|
Loading…
Reference in a new issue