From 2e2f184485d39498072ae9c6ea470188f4bc519d Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Mon, 24 Feb 2014 16:42:34 -0800
Subject: [PATCH] Not sure why beam behaves differently, but fixed its scaling.
---
app/lib/surface/CocoSprite.coffee | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index 28447644e..29ee32371 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -157,11 +157,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
show: ->
@hiding = false
@updateAlpha()
-
+
stop: ->
@imageObject?.stop?()
mark.stop() for name, mark of @marks
-
+
play: ->
@imageObject?.play?()
mark.play() for name, mark of @marks
@@ -206,8 +206,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
if @thang.width isnt @lastThangWidth or @thang.height isnt @lastThangHeight
[@lastThangWidth, @lastThangHeight] = [@thang.width, @thang.height]
bounds = @imageObject.getBounds()
- @imageObject.scaleX = @thang.width * Camera.PPM / bounds.width * @thangType.get('scale') ? 1
- @imageObject.scaleY = @thang.height * Camera.PPM * @options.camera.y2x / bounds.height * @thangType.get('scale') ? 1
+ @imageObject.scaleX = @thang.width * Camera.PPM / bounds.width
+ @imageObject.scaleY = @thang.height * Camera.PPM * @options.camera.y2x / bounds.height
+ unless @thang.spriteName is 'Beam'
+ @imageObject.scaleX *= @thangType.get('scale') ? 1
+ @imageObject.scaleY *= @thangType.get('scale') ? 1
return
scaleX = if @getActionProp 'flipX' then -1 else 1
scaleY = if @getActionProp 'flipY' then -1 else 1