From 8a66c9b0f7a4533f43f7468a5dad664ec16893e9 Mon Sep 17 00:00:00 2001 From: Mike Hawkins Date: Thu, 8 May 2008 04:32:06 +0000 Subject: [PATCH] confusion mod fix --- stepmania/src/ArrowEffects.cpp | 7 +++---- stepmania/src/BPMDisplay.cpp | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 96e5578dc1..a9bff2a17a 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -442,12 +442,11 @@ float ArrowEffects::ReceptorGetRotation( const PlayerState* pPlayerState ) const float* fEffects = pPlayerState->m_PlayerOptions.GetCurrent().m_fEffects; // Confusion - if( fEffects[PlayerOptions::EFFECT_DIZZY] == 0 && fEffects[PlayerOptions::EFFECT_CONFUSION] != 0 ) + if( fEffects[PlayerOptions::EFFECT_CONFUSION] != 0 ) { - const float fSongBeat = GAMESTATE->m_fSongBeatVisible; - float fConfRotation = fNoteBeat - fSongBeat; + float fConfRotation = GAMESTATE->m_fSongBeatVisible; fConfRotation *= fEffects[PlayerOptions::EFFECT_CONFUSION]; - fConfRotation = fmodf( fDizzyRotation, 2*PI ); + fConfRotation = fmodf( fConfRotation, 2*PI ); fConfRotation *= -180/PI; return fConfRotation; } diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index 22b516de84..8f62b1e1c3 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -118,10 +118,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms ) if( MinBPM == MaxBPM ) { if( MinBPM == -1 ) - { SetText( "..." ); // random - IsRandom = true; - } else SetText( ssprintf("%i", MinBPM) ); }