Bring default's changes in.

Hopefully I also handled mac's arch_setup right.

Themes/_fallback/metrics.ini

@@ -572,6 +572,7 @@ MinScoreToMaintainCombo=ComboMaintain()
 MaxScoreToIncrementMissCombo='TapNoteScore_Miss'
 MineHitIncrementsMissCombo=false
 AvoidMineIncrementsCombo=false
+UseInternalScoring=true
 # When you hit it, you know.
 ToastyTriggersAt=250
 

src/Font.cpp

@@ -741,8 +741,6 @@ void Font::Load( const RString &sIniPath, RString sChars )
 	{
 		const RString &sTexturePath = asTexturePaths[i];
 
-		FontPage *pPage = new FontPage;
-
 		// Grab the page name, eg "foo" from "Normal [foo].png".
 		RString sPagename = GetPageNameFromFileName( sTexturePath );
 
@@ -750,6 +748,9 @@ void Font::Load( const RString &sIniPath, RString sChars )
 		if( sTexturePath.find("-stroke") != string::npos )
 			continue;
 
+		// Create this down here so it doesn't leak if the continue gets triggered.
+		FontPage *pPage = new FontPage;
+
 		// Load settings for this page from the INI.
 		FontPageSettings cfg;
 		LoadFontPageSettings( cfg, ini, sTexturePath, "common", sChars );

src/LifeMeterTime.cpp

@@ -48,6 +48,12 @@ LifeMeterTime::LifeMeterTime()
 {
 	m_fLifeTotalGainedSeconds = 0;
 	m_fLifeTotalLostSeconds = 0;
+	m_pStream = NULL;
+}
+
+LifeMeterTime::~LifeMeterTime()
+{
+	delete m_pStream;
 }
 
 void LifeMeterTime::Load( const PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats )

src/LifeMeterTime.h

@@ -16,6 +16,8 @@ class LifeMeterTime : public LifeMeter
 public:
 	LifeMeterTime();
 
+	virtual ~LifeMeterTime();
+
 	virtual void Load( const PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats );
 
 	virtual void Update( float fDeltaTime );

src/MenuTimer.cpp

@@ -22,6 +22,11 @@ MenuTimer::MenuTimer()
 	WARNING_COMMAND = NULL;
 }
 
+MenuTimer::~MenuTimer()
+{
+	delete WARNING_COMMAND;
+}
+
 void MenuTimer::Load( RString sMetricsGroup )
 {
 	m_sprFrame.Load( THEME->GetPathG(sMetricsGroup, "Frame") );

src/MenuTimer.h

@@ -15,6 +15,7 @@ class MenuTimer : public ActorFrame
 {
 public:
 	MenuTimer();
+	virtual ~MenuTimer();
 	void Load( RString sMetricsGroup );
 	
 	virtual void Update( float fDeltaTime ); 

src/ScoreKeeperNormal.cpp

@@ -89,6 +89,7 @@ void ScoreKeeperNormal::Load(
 	m_MaxScoreToIncrementMissCombo.Load( "Gameplay", "MaxScoreToIncrementMissCombo" );
 	m_MineHitIncrementsMissCombo.Load( "Gameplay", "MineHitIncrementsMissCombo" );
 	m_AvoidMineIncrementsCombo.Load( "Gameplay", "AvoidMineIncrementsCombo" );
+	m_UseInternalScoring.Load( "Gameplay", "UseInternalScoring" );
 
 	// Toasty triggers (idea from 3.9+)
 	// Multiple toasty support doesn't seem to be working right now.
@@ -299,6 +300,9 @@ void ScoreKeeperNormal::HandleTapScoreNone()
 
 void ScoreKeeperNormal::AddScoreInternal( TapNoteScore score )
 {
+	if( m_UseInternalScoring )
+	{
+		
 		int &iScore = m_pPlayerStageStats->m_iScore;
 		int &iCurMaxScore = m_pPlayerStageStats->m_iCurMaxScore;
 
@@ -369,6 +373,7 @@ void ScoreKeeperNormal::AddScoreInternal( TapNoteScore score )
 		ASSERT_M( iScore >= 0, "iScore < 0 after re-rounding" );
 
 		// LOG->Trace( "score: %i", iScore );
+	}
 }
 
 void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )

src/ScoreKeeperNormal.h

@@ -40,6 +40,7 @@ class ScoreKeeperNormal: public ScoreKeeper
 	ThemeMetric<TapNoteScore>	m_MaxScoreToIncrementMissCombo;
 	ThemeMetric<bool>		m_MineHitIncrementsMissCombo;
 	ThemeMetric<bool>		m_AvoidMineIncrementsCombo;
+	ThemeMetric<bool>		m_UseInternalScoring;
 
 	//ThemeMetric<LuaReference>	m_vToastyTriggers;
 	ThemeMetric<int>	m_ToastyTrigger;

src/StreamDisplay.cpp

@@ -21,6 +21,8 @@ StreamDisplay::StreamDisplay()
 	m_fPassingAlpha = 0;
 	m_fHotAlpha = 0;
 	m_bAlwaysBounce = false;
+
+	m_bDeleteChildren = true;
 }
 
 void StreamDisplay::Load( const RString & /* unreferenced: _sMetricsGroup  */)