From d3389a90c67a5ca889b9bd0940e67d50029e6e4c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 25 Oct 2005 19:18:48 +0000 Subject: [PATCH] simplify --- stepmania/src/ArrowEffects.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 89c180020e..89c24cce9e 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -237,12 +237,11 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float // if( fAccels[PlayerOptions::ACCEL_BOOMERANG] != 0 ) { - float fOriginalYOffset = fYOffset; - - fYOffset = (-1*fOriginalYOffset*fOriginalYOffset/SCREEN_HEIGHT) + 1.5f*fOriginalYOffset; - float fPeakAtYOffset = SCREEN_HEIGHT * 0.75f; // zero point of function above + float fPeakAtYOffset = SCREEN_HEIGHT * 0.75f; // zero point of boomerang function fPeakYOffsetOut = (-1*fPeakAtYOffset*fPeakAtYOffset/SCREEN_HEIGHT) + 1.5f*fPeakAtYOffset; - bIsPastPeakOut = fOriginalYOffset < fPeakAtYOffset; + bIsPastPeakOut = fYOffset < fPeakAtYOffset; + + fYOffset = (-1*fYOffset*fYOffset/SCREEN_HEIGHT) + 1.5f*fYOffset; } //