simplify
This commit is contained in:
@@ -444,7 +444,7 @@ void OptionsList::Input( const InputEventPlus &input )
|
|||||||
if( input.type == IET_RELEASE )
|
if( input.type == IET_RELEASE )
|
||||||
{
|
{
|
||||||
if( m_bAcceptStartRelease )
|
if( m_bAcceptStartRelease )
|
||||||
Start( input.pn );
|
Start();
|
||||||
m_bStartIsDown = false;
|
m_bStartIsDown = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -604,7 +604,7 @@ void OptionsList::SelectItem( const RString &sRowName, int iMenuItem )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool OptionsList::Start( PlayerNumber pn )
|
bool OptionsList::Start()
|
||||||
{
|
{
|
||||||
const OptionRowHandler *pHandler = GetCurrentHandler();
|
const OptionRowHandler *pHandler = GetCurrentHandler();
|
||||||
const RString &sCurrentRow = m_asMenuStack.back();
|
const RString &sCurrentRow = m_asMenuStack.back();
|
||||||
@@ -614,7 +614,7 @@ bool OptionsList::Start( PlayerNumber pn )
|
|||||||
Pop();
|
Pop();
|
||||||
|
|
||||||
Message msg("OptionsListPop");
|
Message msg("OptionsListPop");
|
||||||
msg.SetParam( "Player", pn );
|
msg.SetParam( "Player", m_pn );
|
||||||
MESSAGEMAN->Broadcast( msg );
|
MESSAGEMAN->Broadcast( msg );
|
||||||
|
|
||||||
return m_asMenuStack.empty();
|
return m_asMenuStack.empty();
|
||||||
@@ -627,7 +627,7 @@ bool OptionsList::Start( PlayerNumber pn )
|
|||||||
TweenOnCurrentRow( true );
|
TweenOnCurrentRow( true );
|
||||||
|
|
||||||
Message msg("OptionsListPush");
|
Message msg("OptionsListPush");
|
||||||
msg.SetParam( "Player", pn );
|
msg.SetParam( "Player", m_pn );
|
||||||
MESSAGEMAN->Broadcast( msg );
|
MESSAGEMAN->Broadcast( msg );
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -645,7 +645,7 @@ bool OptionsList::Start( PlayerNumber pn )
|
|||||||
}
|
}
|
||||||
|
|
||||||
Message msg("OptionsListStart");
|
Message msg("OptionsListStart");
|
||||||
msg.SetParam( "Player", pn );
|
msg.SetParam( "Player", m_pn );
|
||||||
MESSAGEMAN->Broadcast( msg );
|
MESSAGEMAN->Broadcast( msg );
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public:
|
|||||||
void Input( const InputEventPlus &input );
|
void Input( const InputEventPlus &input );
|
||||||
bool IsOpened() const { return m_asMenuStack.size() > 0; }
|
bool IsOpened() const { return m_asMenuStack.size() > 0; }
|
||||||
|
|
||||||
bool Start( PlayerNumber pn ); /* return true if the last menu was popped in response to this press */
|
bool Start(); /* return true if the last menu was popped in response to this press */
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void SelectItem( const RString &sRowName, int iMenuItem );
|
void SelectItem( const RString &sRowName, int iMenuItem );
|
||||||
|
|||||||
Reference in New Issue
Block a user