From 4d3fbff07cda249c8fe39c64f016ae736f8b41cf Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 8 Jun 2004 19:02:57 +0000 Subject: [PATCH] fix baseScale never being included in GetZoomed/GetUnzoomedWidth() (It seems to belong in both.) --- stepmania/src/Actor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index cfb11e2566..003fe378ad 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -103,10 +103,10 @@ public: void SetXY( float x, float y ) { DestTweenState().pos.x = x; DestTweenState().pos.y = y; }; // height and width vary depending on zoom - float GetUnzoomedWidth() { return m_size.x; } - float GetUnzoomedHeight() { return m_size.y; } - float GetZoomedWidth() { return m_size.x * DestTweenState().scale.x; } - float GetZoomedHeight() { return m_size.y * DestTweenState().scale.y; } + float GetUnzoomedWidth() { return m_size.x * m_baseScale.x; } + float GetUnzoomedHeight() { return m_size.y * m_baseScale.y; } + float GetZoomedWidth() { return m_size.x * m_baseScale.x * DestTweenState().scale.x; } + float GetZoomedHeight() { return m_size.y * m_baseScale.y * DestTweenState().scale.y; } void SetWidth( float width ) { m_size.x = width; } void SetHeight( float height ) { m_size.y = height; }