From 88d1f36c3d102a88fcf71967101ea247b75a53e5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 11 Jul 2005 22:25:29 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenNameEntry.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 348a08f475..b67f0daaf8 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -255,10 +255,14 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_In.Load( THEME->GetPathB("ScreenNameEntry","in") ); m_In.StartTransitioning(); -// this->AddChild( &m_In ); // draw and update this manually too + m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); + this->AddChild( &m_In ); m_Out.Load( THEME->GetPathB("ScreenNameEntry","out") ); -// this->AddChild( &m_Out ); // draw and update this manually too + m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); + this->AddChild( &m_Out ); + + this->SortByDrawOrder(); m_soundStep.Load( THEME->GetPathS("ScreenNameEntry","step") ); @@ -287,10 +291,8 @@ void ScreenNameEntry::Update( float fDelta ) m_fFakeBeat += fDelta * FAKE_BEATS_PER_SEC; GAMESTATE->m_fSongBeat = m_fFakeBeat; - Screen::Update(fDelta); - m_In.Update( fDelta ); - m_Out.Update( fDelta ); + Screen::Update(fDelta); } void ScreenNameEntry::DrawPrimitives() @@ -343,10 +345,6 @@ void ScreenNameEntry::DrawPrimitives() m_textSelectedChars[p][t].Draw(); } } - - - m_In.Draw(); - m_Out.Draw(); } void ScreenNameEntry::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )