Add vyhd's changes to OptionsList from SM4SVN

Fix icons for compile with Visual Studio 2003 and 2005
Added ScoreKeeperShared to vs.net2003 project, added ffmpeg libs (modern; todo: add modern libs to repo)
This commit is contained in:
AJ Kelly
2010-01-28 16:52:08 -06:00
parent af956dd4e7
commit 048c064760
6 changed files with 18 additions and 27 deletions
+2 -21
View File
@@ -496,15 +496,12 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
{
m_OptionsList[pn].Input( input );
if( !m_OptionsList[pn].IsOpened() )
CloseOptionsList( pn );
return;
}
else
{
if( input.type == IET_RELEASE && input.MenuI == GAME_BUTTON_SELECT && m_bAcceptSelectRelease[pn] )
OpenOptionsList( pn );
m_OptionsList[pn].Open();
}
}
}
@@ -1036,7 +1033,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
if( !TWO_PART_SELECTION || m_SelectionState == SelectionState_SelectingSteps )
{
if( m_OptionsList[p].IsOpened() )
CloseOptionsList(p);
m_OptionsList[p].Close();
}
UpdateSelectButton( p, false );
}
@@ -1469,22 +1466,6 @@ void ScreenSelectMusic::AfterMusicChange()
AfterStepsOrTrailChange( vpns );
}
void ScreenSelectMusic::OpenOptionsList( PlayerNumber pn )
{
m_OptionsList[pn].Open();
Message msg("OptionsListOpened");
msg.SetParam( "Player", pn );
MESSAGEMAN->Broadcast( msg );
}
void ScreenSelectMusic::CloseOptionsList( PlayerNumber pn )
{
m_OptionsList[pn].Close();
Message msg("OptionsListClosed");
msg.SetParam( "Player", pn );
MESSAGEMAN->Broadcast( msg );
}
// lua start
#include "LuaBinding.h"