From e9c23c0b8392abbb0f37cb5388f1514d0502f266 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Tue, 5 Jul 2011 12:22:23 -0700 Subject: [PATCH] revert changes, swap mini<->tiny when loading as a temp solution. --- src/ArrowEffects.cpp | 13 +++++++------ src/NoteField.cpp | 2 +- src/Player.cpp | 4 ++-- src/PlayerOptions.cpp | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 93b4f9f178..8a2a48e9d6 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 TINY_PERCENT_BASE( "ArrowEffects", "TinyPercentBase" ); -static ThemeMetric TINY_PERCENT_GATE( "ArrowEffects", "TinyPercentGate" ); +static ThemeMetric TINY_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" ); +static ThemeMetric TINY_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" ); static ThemeMetric DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" ); float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse ); @@ -489,12 +489,13 @@ float ArrowEffects::GetXPos( const PlayerState* pPlayerState, int iColNum, float fPixelOffsetFromCenter += pCols[iColNum].fXOffset; - if( fEffects[PlayerOptions::EFFECT_TINY] != 0 ) + // XXX: Mini and tiny have names swapped! Fix this. -shakesoda + if( fEffects[PlayerOptions::EFFECT_MINI] != 0 ) { // Allow Mini to pull tracks together, but not to push them apart. - float fTinyPercent = fEffects[PlayerOptions::EFFECT_TINY]; - fTinyPercent = min( powf(TINY_PERCENT_BASE, fTinyPercent), (float)TINY_PERCENT_GATE ); - fPixelOffsetFromCenter *= fTinyPercent; + float fMiniPercent = fEffects[PlayerOptions::EFFECT_MINI]; + fMiniPercent = min( powf(TINY_PERCENT_BASE, fMiniPercent), (float)TINY_PERCENT_GATE ); + fPixelOffsetFromCenter *= fMiniPercent; } return fPixelOffsetFromCenter; diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 3acfb3ea5e..e97ca24225 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -817,7 +817,7 @@ void NoteField::DrawPrimitives() float fDrawScale = 1; fDrawScale *= 1 + 0.5f * fabsf( current_po.m_fPerspectiveTilt ); - fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_MINI] ); + fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_TINY] ); iDrawDistanceAfterTargetsPixels = (int)(iDrawDistanceAfterTargetsPixels * fDrawScale); iDrawDistanceBeforeTargetsPixels = (int)(iDrawDistanceBeforeTargetsPixels * fDrawScale); diff --git a/src/Player.cpp b/src/Player.cpp index 5dfed3e310..fd3a2202e0 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 - fMiniPercent*0.5f; + float fNoteFieldZoom = 1 - fTinyPercent*0.5f; if( m_pNoteField ) m_pNoteField->SetZoom( fNoteFieldZoom ); if( m_pActorWithJudgmentPosition != NULL ) @@ -1488,7 +1488,7 @@ void Player::DrawPrimitives() float fTiltDegrees = SCALE(fTilt,-1.f,+1.f,+30,-30) * (bReverse?-1:1); - float fZoom = SCALE( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fEffects[PlayerOptions::EFFECT_MINI], 0.f, 1.f, 1.f, 0.5f ); + float fZoom = SCALE( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fEffects[PlayerOptions::EFFECT_TINY], 0.f, 1.f, 1.f, 0.5f ); if( fTilt > 0 ) fZoom *= SCALE( fTilt, 0.f, 1.f, 1.f, 0.9f ); else diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp index a6f279a107..e151e15f4d 100644 --- a/src/PlayerOptions.cpp +++ b/src/PlayerOptions.cpp @@ -155,8 +155,8 @@ void PlayerOptions::GetMods( vector &AddTo, bool bForceNoteSkin ) const AddPart( AddTo, m_fEffects[EFFECT_DRUNK], "Drunk" ); AddPart( AddTo, m_fEffects[EFFECT_DIZZY], "Dizzy" ); AddPart( AddTo, m_fEffects[EFFECT_CONFUSION], "Confusion" ); - AddPart( AddTo, m_fEffects[EFFECT_MINI], "Mini" ); - AddPart( AddTo, m_fEffects[EFFECT_TINY], "Tiny" ); + AddPart( AddTo, m_fEffects[EFFECT_MINI], "Tiny" ); + AddPart( AddTo, m_fEffects[EFFECT_TINY], "Mini" ); AddPart( AddTo, m_fEffects[EFFECT_FLIP], "Flip" ); AddPart( AddTo, m_fEffects[EFFECT_INVERT], "Invert" ); AddPart( AddTo, m_fEffects[EFFECT_TORNADO], "Tornado" );