load in Init()

This commit is contained in:
Glenn Maynard
2006-01-15 19:22:17 +00:00
parent 1c5b3c9002
commit f6ea595c12
4 changed files with 32 additions and 28 deletions
+5 -4
View File
@@ -20,15 +20,16 @@
#define UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage")
ScreenSelect::ScreenSelect( CString sClassName ) :
ScreenWithMenuElements(sClassName),
IDLE_COMMENT_SECONDS(m_sName,"IdleCommentSeconds"),
IDLE_TIMEOUT_SECONDS(m_sName,"IdleTimeoutSeconds"),
ALLOW_DISABLED_PLAYER_INPUT(m_sName,"AllowDisabledPlayerInput")
ScreenWithMenuElements(sClassName)
{
}
void ScreenSelect::Init()
{
IDLE_COMMENT_SECONDS.Load( m_sName, "IdleCommentSeconds" );
IDLE_TIMEOUT_SECONDS.Load( m_sName, "IdleTimeoutSeconds" );
ALLOW_DISABLED_PLAYER_INPUT.Load( m_sName, "AllowDisabledPlayerInput" );
ScreenWithMenuElements::Init();
//
+2 -1
View File
@@ -29,11 +29,12 @@
REGISTER_SCREEN_CLASS( ScreenSelectDifficulty );
ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSelect( sClassName )
{
m_CurrentPage = PAGE_1;
}
void ScreenSelectDifficulty::Init()
{
m_CurrentPage = PAGE_1;
ScreenSelect::Init();
FOREACH_PlayerNumber( p )
+23 -22
View File
@@ -22,33 +22,34 @@ CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dO
CString OPTION_ORDER_NAME( size_t dir ) { return "OptionOrder"+MenuDirToString((MenuDir)dir); }
REGISTER_SCREEN_CLASS( ScreenSelectMaster );
ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ),
SHOW_ICON(m_sName,"ShowIcon"),
SHOW_SCROLLER(m_sName,"ShowScroller"),
SHOW_CURSOR(m_sName,"ShowCursor"),
SHARED_SELECTION(m_sName,"SharedSelection"),
NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"),
CURSOR_OFFSET_X_FROM_ICON(m_sName,CURSOR_OFFSET_X_FROM_ICON_NAME,NUM_PLAYERS),
CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS),
OVERRIDE_LOCK_INPUT_SECONDS(m_sName,"OverrideLockInputSeconds"),
LOCK_INPUT_SECONDS(m_sName,"LockInputSeconds"),
PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
OPTION_ORDER(m_sName,OPTION_ORDER_NAME,NUM_MENU_DIRS),
WRAP_CURSOR(m_sName,"WrapCursor"),
WRAP_SCROLLER(m_sName,"WrapScroller"),
LOOP_SCROLLER(m_sName,"LoopScroller"),
ALLOW_REPEATING_INPUT(m_sName,"AllowRepeatingInput"),
SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
SCROLLER_NUM_ITEMS_TO_DRAW(m_sName,"ScrollerNumItemsToDraw"),
SCROLLER_TRANSFORM(m_sName,"ScrollerTransform"),
SCROLLER_SUBDIVISIONS(m_sName,"ScrollerSubdivisions"),
DEFAULT_CHOICE(m_sName,"DefaultChoice")
ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName )
{
}
void ScreenSelectMaster::Init()
{
SHOW_ICON.Load( m_sName, "ShowIcon" );
SHOW_SCROLLER.Load( m_sName, "ShowScroller" );
SHOW_CURSOR.Load( m_sName, "ShowCursor" );
SHARED_SELECTION.Load( m_sName, "SharedSelection" );
NUM_CHOICES_ON_PAGE_1.Load( m_sName, "NumChoicesOnPage1" );
CURSOR_OFFSET_X_FROM_ICON.Load( m_sName, CURSOR_OFFSET_X_FROM_ICON_NAME, NUM_PLAYERS );
CURSOR_OFFSET_Y_FROM_ICON.Load( m_sName, CURSOR_OFFSET_Y_FROM_ICON_NAME, NUM_PLAYERS );
OVERRIDE_LOCK_INPUT_SECONDS.Load( m_sName, "OverrideLockInputSeconds" );
LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" );
PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" );
POST_SWITCH_PAGE_SECONDS.Load( m_sName, "PostSwitchPageSeconds" );
OPTION_ORDER.Load( m_sName, OPTION_ORDER_NAME, NUM_MENU_DIRS );
WRAP_CURSOR.Load( m_sName, "WrapCursor" );
WRAP_SCROLLER.Load( m_sName, "WrapScroller" );
LOOP_SCROLLER.Load( m_sName, "LoopScroller" );
ALLOW_REPEATING_INPUT.Load( m_sName, "AllowRepeatingInput" );
SCROLLER_SECONDS_PER_ITEM.Load( m_sName, "ScrollerSecondsPerItem" );
SCROLLER_NUM_ITEMS_TO_DRAW.Load( m_sName, "ScrollerNumItemsToDraw" );
SCROLLER_TRANSFORM.Load( m_sName, "ScrollerTransform" );
SCROLLER_SUBDIVISIONS.Load( m_sName, "ScrollerSubdivisions" );
DEFAULT_CHOICE.Load( m_sName, "DefaultChoice" );
ScreenSelect::Init();
m_TrackingRepeatingInput.MakeInvalid();
+2 -1
View File
@@ -22,11 +22,12 @@
REGISTER_SCREEN_CLASS( ScreenSelectStyle );
ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClassName )
{
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
}
void ScreenSelectStyle::Init()
{
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
ScreenSelect::Init();
m_iSelection = 0;