diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 03e7f4adbb..bf87efc659 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -200,8 +200,8 @@ DrunkOffsetFrequency=10 DrunkArrowMagnitude=0.5 BeatOffsetHeight=15 BeatPIHeight=2 -MiniPercentBase=0.5 -MiniPercentGate=1 +TinyPercentBase=0.5 +TinyPercentGate=1 DizzyHoldHeads=false QuantizeArrowYPosition=false diff --git a/Themes/default/Graphics/CombinedLifeMeterTug separator.redir b/Themes/default/Graphics/CombinedLifeMeterTug separator.redir index 04b2ead777..65de2f434b 100644 --- a/Themes/default/Graphics/CombinedLifeMeterTug separator.redir +++ b/Themes/default/Graphics/CombinedLifeMeterTug separator.redir @@ -1 +1 @@ -_blank \ No newline at end of file +_CombinedLifeMeterTug separator \ No newline at end of file diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 5b6dd64b08..93b4f9f178 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -56,8 +56,8 @@ static ThemeMetric DRUNK_OFFSET_FREQUENCY( "ArrowEffects", "DrunkOffsetFr static ThemeMetric DRUNK_ARROW_MAGNITUDE( "ArrowEffects", "DrunkArrowMagnitude" ); static ThemeMetric BEAT_OFFSET_HEIGHT( "ArrowEffects", "BeatOffsetHeight" ); static ThemeMetric BEAT_PI_HEIGHT( "ArrowEffects", "BeatPIHeight" ); -static ThemeMetric MINI_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" ); -static ThemeMetric MINI_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" ); +static ThemeMetric TINY_PERCENT_BASE( "ArrowEffects", "TinyPercentBase" ); +static ThemeMetric TINY_PERCENT_GATE( "ArrowEffects", "TinyPercentGate" ); static ThemeMetric DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" ); float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse ); @@ -489,12 +489,12 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float fPixelOffsetFromCenter += pCols[iColNum].fXOffset; - if( fEffects[PlayerOptions::EFFECT_MINI] != 0 ) + if( fEffects[PlayerOptions::EFFECT_TINY] != 0 ) { // Allow Mini to pull tracks together, but not to push them apart. - float fMiniPercent = fEffects[PlayerOptions::EFFECT_MINI]; - fMiniPercent = min( powf(MINI_PERCENT_BASE, fMiniPercent), (float)MINI_PERCENT_GATE ); - fPixelOffsetFromCenter *= fMiniPercent; + float fTinyPercent = fEffects[PlayerOptions::EFFECT_TINY]; + fTinyPercent = min( powf(TINY_PERCENT_BASE, fTinyPercent), (float)TINY_PERCENT_GATE ); + fPixelOffsetFromCenter *= fTinyPercent; } return fPixelOffsetFromCenter; diff --git a/src/Player.cpp b/src/Player.cpp index aa883c59c1..5dfed3e310 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -867,7 +867,7 @@ void Player::Update( float fDeltaTime ) Actor::TweenState::MakeWeightedAverage( m_pActorWithComboPosition->DestTweenState(), ts1, ts2, fPercentCentered ); } - float fNoteFieldZoom = 1 - fTinyPercent*0.5f; + float fNoteFieldZoom = 1 - fMiniPercent*0.5f; if( m_pNoteField ) m_pNoteField->SetZoom( fNoteFieldZoom ); if( m_pActorWithJudgmentPosition != NULL )