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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Scott Erickson 2014-03-06 17:27:01 -08:00
commit 34278a8648
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
scale *= @options.resolutionFactor if prop is 'registration' scale *= @options.resolutionFactor if prop is 'registration'
pos.x *= scale pos.x *= scale
pos.y *= scale pos.y *= scale
if @thang if @thang and prop isnt 'registration'
scaleFactor = @thang.scaleFactor ? 1 scaleFactor = @thang.scaleFactor ? 1
pos.x *= @thang.scaleFactorX ? scaleFactor pos.x *= @thang.scaleFactorX ? scaleFactor
pos.y *= @thang.scaleFactorY ? scaleFactor pos.y *= @thang.scaleFactorY ? scaleFactor