[default -> sm5a2futures] Due for this now.

src/GameState.cpp

@@ -103,7 +103,7 @@ static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2	("GameState","GradeTierFo
 static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED	("GameState","AreStagePlayerModsForced");
 static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED	("GameState","AreStageSongModsForced");
 
-static Preference<Premium> g_Premium( "Premium", Premium_Off );
+static Preference<Premium> g_Premium( "Premium", Premium_DoubleFor1Credit );
 Preference<bool> GameState::m_bAutoJoin( "AutoJoin", false );
 
 GameState::GameState() :

src/MemoryCardManager.cpp

@@ -39,7 +39,7 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut
 	defaultValueOut = -1;
 }
 
-static Preference<bool>	g_bMemoryCards( "MemoryCards", true );
+static Preference<bool>	g_bMemoryCards( "MemoryCards", false );
 static Preference<bool>	g_bMemoryCardProfiles( "MemoryCardProfiles", true );
 
 // if set, always use the device that mounts to this point

src/MusicWheel.cpp

@@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType )
 
 	m_soundChangeSort.Load(	THEME->GetPathS(sType,"sort") );
 	m_soundExpand.Load(	THEME->GetPathS(sType,"expand"), true );
+	m_soundCollapse.Load(	THEME->GetPathS(sType,"collapse"), true );
 
 	// Update for SORT_MOST_PLAYED.
 	SONGMAN->UpdatePopular();

src/PrefsManager.cpp

@@ -213,7 +213,7 @@ PrefsManager::PrefsManager() :
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
 	m_ShowSongOptions		( "ShowSongOptions",		Maybe_YES ),
-	m_bDancePointsForOni		( "DancePointsForOni",		false ),
+	m_bDancePointsForOni		( "DancePointsForOni",		true ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),
 	m_fMinPercentageForMachineSongHighScore		( "MinPercentageForMachineSongHighScore",	0.0001f ), // This is for home, who cares how bad you do?
 	m_fMinPercentageForMachineCourseHighScore	( "MinPercentageForMachineCourseHighScore",	0.0001f ),	// don't save course scores with 0 percentage

src/ScreenDebugOverlay.cpp

@@ -262,13 +262,10 @@ void ScreenDebugOverlay::Init()
 		BitmapText *p = new BitmapText;
 		p->SetName( "PageText" );
 		p->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "page") );
-		LOAD_ALL_COMMANDS( p );
-		// xxx: I shouldn't have to do this:
-		ON_COMMAND( p );
+		LOAD_ALL_COMMANDS_AND_ON_COMMAND( p );
 		// todo: Y value is still hardcoded. -aj
 		p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 );
 		p->SetText( *s + " (" + sButton + ")" );
-		//p->SetShadowLength( 1 );
 		m_vptextPages.push_back( p );
 		this->AddChild( p );
 	}
@@ -281,10 +278,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_right );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
 			m_vptextButton.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -294,10 +288,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_left );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
 			m_vptextFunction.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -366,7 +357,6 @@ void ScreenDebugOverlay::UpdateText()
 
 		int i = p-g_pvpSubscribers->begin();
 
-		//float fY = SCREEN_TOP+50 + iOffset * 16;
 		float fY = LINE_START_Y + iOffset * LINE_SPACING;
 
 		BitmapText &txt1 = *m_vptextButton[i];

src/ScreenSelectMusic.cpp

@@ -94,6 +94,7 @@ void ScreenSelectMusic::Init()
 	TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" );
 	WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" );
 	NULL_SCORE_STRING.Load( m_sName, "NullScoreString" );
+	PLAY_SOUND_ON_ENTERING_OPTIONS_MENU.Load( m_sName, "PlaySoundOnEnteringOptionsMenu" );
 	// To allow changing steps with gamebuttons -DaisuMaster
 	CHANGE_STEPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeStepsWithGameButtons" );
 	CHANGE_GROUPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeGroupsWithGameButtons" );
@@ -437,7 +438,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		}
 
 		m_bGoToOptions = true;
-		m_soundStart.Play();
+		if( PLAY_SOUND_ON_ENTERING_OPTIONS_MENU )
+			m_soundStart.Play();
 		this->PlayCommand( "ShowEnteringOptions" );
 
 		// Re-queue SM_BeginFadingOut, since ShowEnteringOptions may have

src/ScreenSelectMusic.h

@@ -97,6 +97,7 @@ protected:
 	ThemeMetric<bool>		CHANGE_STEPS_WITH_GAME_BUTTONS;
 	ThemeMetric<bool>		CHANGE_GROUPS_WITH_GAME_BUTTONS;
 	ThemeMetric<RString>	NULL_SCORE_STRING;
+	ThemeMetric<bool>		PLAY_SOUND_ON_ENTERING_OPTIONS_MENU;
 
 	bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }
 	bool CanChangeSteps() const { return TWO_PART_SELECTION ? m_SelectionState == SelectionState_SelectingSteps : m_SelectionState == SelectionState_SelectingSong; }

src/WheelBase.cpp

@@ -283,11 +283,15 @@ bool WheelBase::Select()	// return true if this selection can end the screen
 		{
 			RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText;
 			if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded
+			{
 				SetOpenSection( "" ); // collapse it
+				m_soundCollapse.Play();
+			}
 			else // already collapsed
+			{
 				SetOpenSection( sThisItemSectionName ); // expand it
-
-			m_soundExpand.Play();
+				m_soundExpand.Play();
+			}
 		}
 		break;
 	default:

src/WheelBase.h

@@ -99,6 +99,7 @@ protected:
 
 	RageSound m_soundChangeMusic;
 	RageSound m_soundExpand;
+	RageSound m_soundCollapse;
 	RageSound m_soundLocked;
 
 //	bool WheelItemIsVisible(int n);