re-fix bug where the timing modifier was listed even with no change; renamed to ...
authorMark Cannon <vyhdycokio@gmail.com>
Tue, 15 Mar 2011 21:06:15 +0000 (17:06 -0400)
committerCarl Myers <cmyers@cmyers.org>
Sun, 20 Mar 2011 03:46:55 +0000 (20:46 -0700)
assets/patch-data/patch-dec/Themes/default/Languages/english.ini
src/PlayerOptions.cpp

index bfda483..042c04b 100644 (file)
@@ -485,7 +485,7 @@ Split=Split
 Alternate=Alternate
 Cross=Cross
 Centered=Centered
-JudgeScale=Judge Scale
+Timing=Timing
 
 Boost=Accel
 Brake=Decel
index c09b6ea..412edc9 100755 (executable)
@@ -155,10 +155,11 @@ void PlayerOptions::GetMods( vector<CString> &AddTo ) const
        AddPart( AddTo, m_fCover,       "Cover" );
 
        AddPart( AddTo, m_fPassmark, "Passmark" );
-       AddPart( AddTo, m_fTimingScale, "JudgeScale" );
-
        AddPart( AddTo, m_fRandomSpeed, "RandomSpeed" );
 
+       if( m_fTimingScale != 1.0f )
+               AddPart( AddTo, m_fTimingScale, "Timing" );
+
        if( m_bTurns[TURN_MIRROR] )                     AddTo.push_back( "Mirror" );
        if( m_bTurns[TURN_LEFT] )                       AddTo.push_back( "Left" );
        if( m_bTurns[TURN_RIGHT] )                      AddTo.push_back( "Right" );