Init -> InitMenu
This commit is contained in:
@@ -51,7 +51,7 @@ ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions
|
|||||||
g_NetworkOptionsLines[PO_SERVER].choices.push_back("Stop");
|
g_NetworkOptionsLines[PO_SERVER].choices.push_back("Stop");
|
||||||
g_NetworkOptionsLines[PO_SERVER].choices.push_back("Start...");
|
g_NetworkOptionsLines[PO_SERVER].choices.push_back("Start...");
|
||||||
|
|
||||||
Init(
|
InitMenu(
|
||||||
INPUTMODE_SHARE_CURSOR,
|
INPUTMODE_SHARE_CURSOR,
|
||||||
g_NetworkOptionsLines,
|
g_NetworkOptionsLines,
|
||||||
NUM_NETWORK_OPTIONS_LINES );
|
NUM_NETWORK_OPTIONS_LINES );
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText )
|
|||||||
m_Rows[iRow]->m_OptionIcons[pn].Load( pn, sText, false );
|
m_Rows[iRow]->m_OptionIcons[pn].Load( pn, sText, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOptionLines )
|
void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNumOptionLines )
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenOptions::Set()" );
|
LOG->Trace( "ScreenOptions::Set()" );
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class ScreenOptions : public ScreenWithMenuElements
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptions( CString sClassName );
|
ScreenOptions( CString sClassName );
|
||||||
void Init( InputMode im, OptionRowData OptionRowData[], int iNumOptionLines );
|
void InitMenu( InputMode im, OptionRowData OptionRowData[], int iNumOptionLines );
|
||||||
virtual ~ScreenOptions();
|
virtual ~ScreenOptions();
|
||||||
virtual void Update( float fDeltaTime );
|
virtual void Update( float fDeltaTime );
|
||||||
virtual void DrawPrimitives();
|
virtual void DrawPrimitives();
|
||||||
|
|||||||
@@ -296,7 +296,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
|
|||||||
|
|
||||||
ASSERT( OptionRowHandlers.size() == asLineNames.size() );
|
ASSERT( OptionRowHandlers.size() == asLineNames.size() );
|
||||||
|
|
||||||
Init( im, m_OptionRowAlloc, asLineNames.size() );
|
InitMenu( im, m_OptionRowAlloc, asLineNames.size() );
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenOptionsMaster::~ScreenOptionsMaster()
|
ScreenOptionsMaster::~ScreenOptionsMaster()
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions
|
|||||||
else
|
else
|
||||||
g_ProfileOptionsLines[PO_OS_MOUNT_2].choices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2];
|
g_ProfileOptionsLines[PO_OS_MOUNT_2].choices[0] = PREFSMAN->m_sMemoryCardOsMountPoint[PLAYER_2];
|
||||||
|
|
||||||
Init(
|
InitMenu(
|
||||||
INPUTMODE_SHARE_CURSOR,
|
INPUTMODE_SHARE_CURSOR,
|
||||||
g_ProfileOptionsLines,
|
g_ProfileOptionsLines,
|
||||||
NUM_PROFILE_OPTIONS_LINES );
|
NUM_PROFILE_OPTIONS_LINES );
|
||||||
|
|||||||
Reference in New Issue
Block a user