Use Init() for all screens, so we can set state before the base class

members are loaded--they'll see resets, score finalization, etc.  It
also results in smaller code, due to a g++ bug that causes constructors
to be emitted several times.
This commit is contained in:
Glenn Maynard
2005-02-23 06:29:05 +00:00
parent 1213a2c9b0
commit b51b0cfb4c
100 changed files with 349 additions and 42 deletions
+7 -6
View File
@@ -18,18 +18,19 @@
//REGISTER_SCREEN_CLASS( ScreenWithMenuElements );
ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( sClassName )
{
LOG->Trace( "ScreenWithMenuElements::ScreenWithMenuElements()" );
m_MenuTimer = new MenuTimer;
m_textHelp = new HelpDisplay;
}
m_FirstUpdateCommand.Load( sClassName, "FirstUpdateCommand" );
void ScreenWithMenuElements::Init()
{
LOG->Trace( "ScreenWithMenuElements::Init()" );
LOG->Trace( "MenuElements::MenuElements()" );
Screen::Init();
ASSERT( this->m_SubActors.empty() ); // don't call Load twice!
m_FirstUpdateCommand.Load( m_sName, "FirstUpdateCommand" );
this->SetName( sClassName );
ASSERT( this->m_SubActors.empty() ); // don't call Init twice!
m_autoHeader.Load( THEME->GetPathG(m_sName,"header") );
m_autoHeader->SetName("Header");