actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix expand

Browse Source
This commit is contained in:
Glenn Maynard
2003-06-17 19:26:16 +00:00
parent 6d384b4ee6
commit 121fa91c67
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ArrowEffects.cpp
+4 -3
View File
@@ -22,7 +22,6 @@
#include <math.h> #include <math.h>
RageTimer g_timerExpand;
float g_fExpandSeconds = 0; float g_fExpandSeconds = 0;
float ArrowGetYOffset( PlayerNumber pn, float fNoteBeat ) float ArrowGetYOffset( PlayerNumber pn, float fNoteBeat )
@@ -67,10 +66,12 @@ float ArrowGetYOffset( PlayerNumber pn, float fNoteBeat )
fYAdjust += fAccels[PlayerOptions::ACCEL_WAVE] * 20.0f*sinf( fYOffset/38.0f ); fYAdjust += fAccels[PlayerOptions::ACCEL_WAVE] * 20.0f*sinf( fYOffset/38.0f );
if( fAccels[PlayerOptions::ACCEL_EXPAND] > 0 ) if( fAccels[PlayerOptions::ACCEL_EXPAND] > 0 )
{ {
/* Timers can't be global, since they'll be initialized before SDL. */
static RageTimer timerExpand;
if( !GAMESTATE->m_bFreeze ) if( !GAMESTATE->m_bFreeze )
g_fExpandSeconds += g_timerExpand.GetDeltaTime(); g_fExpandSeconds += timerExpand.GetDeltaTime();
else else
g_timerExpand.GetDeltaTime(); // throw away timerExpand.GetDeltaTime(); // throw away
fYAdjust += fAccels[PlayerOptions::ACCEL_EXPAND] * (fYOffset * SCALE( cosf(g_fExpandSeconds*3), -1, 1, 0.5f, 1.5f ) - fYOffset); fYAdjust += fAccels[PlayerOptions::ACCEL_EXPAND] * (fYOffset * SCALE( cosf(g_fExpandSeconds*3), -1, 1, 0.5f, 1.5f ) - fYOffset);
} }
if( fAccels[PlayerOptions::ACCEL_BOOMERANG] > 0 ) if( fAccels[PlayerOptions::ACCEL_BOOMERANG] > 0 )