From 0d9f9977ce7359b124e3b0297ee9133fe6e697dd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 9 May 2005 03:42:18 +0000 Subject: [PATCH] update --- stepmania/Themes/default/metrics.ini | 4 ++++ stepmania/src/ScreenTestLights.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ed01be4aa6..848d443c77 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2589,6 +2589,10 @@ Fallback=ScreenOperatorMenu [ScreenTestLights] Class=ScreenTestLights Fallback=ScreenOperatorMenu +TextX=SCREEN_CENTER_X-200 +TextY=SCREEN_CENTER_Y +TextOnCommand= +TextOffCommand= [ScreenNetworkOptions] Class=ScreenNetworkOptions diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp index 181f74f199..6af8a89737 100644 --- a/stepmania/src/ScreenTestLights.cpp +++ b/stepmania/src/ScreenTestLights.cpp @@ -23,11 +23,10 @@ void ScreenTestLights::Init() { ScreenWithMenuElements::Init(); + m_textInputs.SetName( "Text" ); m_textInputs.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInputs.SetText( "" ); - m_textInputs.SetXY( SCREEN_CENTER_X - 200, SCREEN_CENTER_Y ); - m_textInputs.SetHorizAlign( Actor::align_left ); - m_textInputs.SetZoom( 0.8f ); + SET_XY_AND_ON_COMMAND( m_textInputs ); this->AddChild( &m_textInputs ); SOUND->PlayMusic( THEME->GetPathS("ScreenTestLights","music") ); @@ -144,6 +143,7 @@ void ScreenTestLights::MenuBack( PlayerNumber pn ) if(!IsTransitioning()) { SCREENMAN->PlayStartSound(); + OFF_COMMAND( m_textInputs ); StartTransitioning( SM_GoToPrevScreen ); } }