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

Fixed bug with scale not updating properly when paused.

Browse source
This commit is contained in:
Nick Winter 2014-04-29 16:04:22 -07:00
parent 4ad7ebc95d
commit 04d74fb76f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,8 +177,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
# Gets the sprite to reflect what the current state of the thangs and surface are
return if @stillLoading
@updatePosition()
frameChanged = frameChanged or @targetScaleFactor isnt @scaleFactor
if frameChanged
@updateScale() # must happen before rotation
@updateScale() # must happen before rotation
@updateAlpha()
@updateRotation()
@updateAction()
@ -274,7 +275,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
if (@thang.scaleFactor or 1) isnt @targetScaleFactor
createjs.Tween.removeTweens(@)
createjs.Tween.get(@).to({scaleFactor:@thang.scaleFactor or 1}, 2000, createjs.Ease.elasticOut)
@targetScaleFactor = @thang.scaleFactor
@targetScaleFactor = @thang.scaleFactor or 1
updateAlpha: ->
@imageObject.alpha = if @hiding then 0 else 1