codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed two bugs with destroying sprites.

Browse source
This commit is contained in:
Nick Winter 2014-03-14 17:15:07 -07:00
parent 357b73be93
commit fc7d403785
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/lib/surface/CocoSprite.coffee
View file

@ -205,6 +205,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
.to({alpha: 0.6, scaleY: @options.camera.y2x, scaleX: 1}, 100, createjs.Ease.circOut) .to({alpha: 0.6, scaleY: @options.camera.y2x, scaleX: 1}, 100, createjs.Ease.circOut)
.to({alpha: 0, scaleY: 0, scaleX: 0}, 700, createjs.Ease.circIn) .to({alpha: 0, scaleY: 0, scaleX: 0}, 700, createjs.Ease.circIn)
.call => .call =>
return if @destroyed
@options.groundLayer.removeChild circle @options.groundLayer.removeChild circle
delete @handledAoEs[event] delete @handledAoEs[event]

2
app/lib/surface/SpriteBoss.coffee
View file

@ -300,7 +300,7 @@ module.exports = class SpriteBoss extends CocoClass
@willSelectThang = [thangID, null] @willSelectThang = [thangID, null]
@updateTarget() @updateTarget()
return unless @selectionMark return unless @selectionMark
@selectedSprite = null unless @selectedSprite?.thang @selectedSprite = null if @selectedSprite and (@selectedSprite.destroyed or not @selectedSprite.thang)
@selectionMark.toggle @selectedSprite? @selectionMark.toggle @selectedSprite?
@selectionMark.setSprite @selectedSprite @selectionMark.setSprite @selectedSprite
@selectionMark.update() @selectionMark.update()