From 07047a833af22bc8ad9d267f919ded4c8c31de1d Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 15 Apr 2005 06:39:44 +0000
Subject: [PATCH] metric scheme update

---
 stepmania/src/ScreenOptions.cpp | 7 +++----
 stepmania/src/ScreenOptions.h   | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 93405139af..01abf0499a 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -89,8 +89,6 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
 	SCROLL_BAR_HEIGHT				(m_sName,"ScrollBarHeight"),
 	SCROLL_BAR_TIME					(m_sName,"ScrollBarTime"),
 	EXPLANATION_ZOOM				(m_sName,"ExplanationZoom"),
-	FRAME_ON_COMMAND				(m_sName,"FrameOnCommand"),
-	FRAME_OFF_COMMAND				(m_sName,"FrameOffCommand"),
 	SHOW_EXIT_ROW					(m_sName,"ShowExitRow"),
 	SEPARATE_EXIT_ROW				(m_sName,"SeparateExitRow"),
 	SEPARATE_EXIT_ROW_Y				(m_sName,"SeparateExitRowY"),
@@ -116,6 +114,7 @@ void ScreenOptions::Init()
 	m_SoundToggleOff.Load( THEME->GetPathS(m_sName,"toggle off"), true );
 
 	// add everything to m_framePage so we can animate everything at once
+	m_framePage.SetName( "Frame" );
 	this->AddChild( &m_framePage );
 
 	m_bMoreShown = false;
@@ -127,7 +126,7 @@ void ScreenOptions::Init()
 		m_bGotAtLeastOneStartPressed[p] = false;
 	}
 
-	m_framePage.RunCommands( FRAME_ON_COMMAND );
+	ON_COMMAND( m_framePage );
 }
 
 void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText )
@@ -529,7 +528,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
 
 		SCREENMAN->PlayStartSound();
 
-		m_framePage.RunCommands( FRAME_OFF_COMMAND );
+		OFF_COMMAND( m_framePage );
 		break;
 	case SM_GainFocus:
 		INPUTFILTER->SetRepeatRate( 0.25f, 12, 0.25f, 12 );
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index f22b39c3c7..89769ccdfd 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -135,8 +135,6 @@ protected:
 	ThemeMetric<float>				SCROLL_BAR_HEIGHT;
 	ThemeMetric<float>				SCROLL_BAR_TIME;
 	ThemeMetric<float>				EXPLANATION_ZOOM;
-	ThemeMetric<apActorCommands>	FRAME_ON_COMMAND;
-	ThemeMetric<apActorCommands>	FRAME_OFF_COMMAND;
 	ThemeMetric<bool>				SHOW_EXIT_ROW;
 	ThemeMetric<bool>				SEPARATE_EXIT_ROW;
 	ThemeMetric<float>				SEPARATE_EXIT_ROW_Y;