explicit load for MenuTimer, so we don't load anything if we don't want it
This commit is contained in:
@@ -27,7 +27,10 @@ MenuTimer::MenuTimer() :
|
|||||||
m_fStallSeconds = 0;
|
m_fStallSeconds = 0;
|
||||||
m_fStallSecondsLeft = MAX_STALL_SECONDS;
|
m_fStallSecondsLeft = MAX_STALL_SECONDS;
|
||||||
m_bPaused = false;
|
m_bPaused = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MenuTimer::Load()
|
||||||
|
{
|
||||||
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
|
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
|
||||||
{
|
{
|
||||||
m_text[i].LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
|
m_text[i].LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class MenuTimer : public ActorFrame
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MenuTimer();
|
MenuTimer();
|
||||||
|
void Load();
|
||||||
|
|
||||||
virtual void Update( float fDeltaTime );
|
virtual void Update( float fDeltaTime );
|
||||||
|
|
||||||
|
|||||||
@@ -244,6 +244,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
m_Timer.Load();
|
||||||
if( !PREFSMAN->m_bMenuTimer )
|
if( !PREFSMAN->m_bMenuTimer )
|
||||||
m_Timer.Disable();
|
m_Timer.Disable();
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ void ScreenWithMenuElements::Init()
|
|||||||
m_bTimerEnabled = (TIMER_SECONDS != -1);
|
m_bTimerEnabled = (TIMER_SECONDS != -1);
|
||||||
if( m_bTimerEnabled )
|
if( m_bTimerEnabled )
|
||||||
{
|
{
|
||||||
|
m_MenuTimer->Load();
|
||||||
m_MenuTimer->SetName( "Timer" );
|
m_MenuTimer->SetName( "Timer" );
|
||||||
if( TIMER_STEALTH )
|
if( TIMER_STEALTH )
|
||||||
m_MenuTimer->EnableStealth( true );
|
m_MenuTimer->EnableStealth( true );
|
||||||
|
|||||||
Reference in New Issue
Block a user