remove "unlock"; do this with Lua: UNLOCKMAN:UnlockEntryID
This commit is contained in:
@@ -52,7 +52,6 @@ void GameCommand::Init()
|
|||||||
m_pTrail = NULL;
|
m_pTrail = NULL;
|
||||||
m_pCharacter = NULL;
|
m_pCharacter = NULL;
|
||||||
m_SortOrder = SortOrder_Invalid;
|
m_SortOrder = SortOrder_Invalid;
|
||||||
m_sUnlockEntryID = "";
|
|
||||||
m_sSoundPath = "";
|
m_sSoundPath = "";
|
||||||
m_vsScreensToPrepare.clear();
|
m_vsScreensToPrepare.clear();
|
||||||
m_iWeightPounds = -1;
|
m_iWeightPounds = -1;
|
||||||
@@ -355,10 +354,6 @@ void GameCommand::LoadOne( const Command& cmd )
|
|||||||
{
|
{
|
||||||
m_sUrl = sValue;
|
m_sUrl = sValue;
|
||||||
}
|
}
|
||||||
else if( sName == "unlock" )
|
|
||||||
{
|
|
||||||
m_sUnlockEntryID = sValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
else if( sName == "sound" )
|
else if( sName == "sound" )
|
||||||
{
|
{
|
||||||
@@ -690,6 +685,9 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
|
|||||||
SCREENMAN->SetNewScreen( m_sScreen );
|
SCREENMAN->SetNewScreen( m_sScreen );
|
||||||
if( m_pSong )
|
if( m_pSong )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "set %p, %s",
|
||||||
|
m_pSong, m_pSong->GetTranslitFullTitle().c_str() );
|
||||||
|
|
||||||
GAMESTATE->m_pCurSong.Set( m_pSong );
|
GAMESTATE->m_pCurSong.Set( m_pSong );
|
||||||
GAMESTATE->m_pPreferredSong = m_pSong;
|
GAMESTATE->m_pPreferredSong = m_pSong;
|
||||||
}
|
}
|
||||||
@@ -724,8 +722,6 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
|
|||||||
GAMESTATE->m_sPreferredSongGroup.Set( m_sSongGroup );
|
GAMESTATE->m_sPreferredSongGroup.Set( m_sSongGroup );
|
||||||
if( m_SortOrder != SortOrder_Invalid )
|
if( m_SortOrder != SortOrder_Invalid )
|
||||||
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
|
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
|
||||||
if( !m_sUnlockEntryID.empty() )
|
|
||||||
UNLOCKMAN->UnlockEntryID( m_sUnlockEntryID );
|
|
||||||
if( m_sSoundPath != "" )
|
if( m_sSoundPath != "" )
|
||||||
SOUND->PlayOnce( THEME->GetPathS( "", m_sSoundPath ) );
|
SOUND->PlayOnce( THEME->GetPathS( "", m_sSoundPath ) );
|
||||||
if( m_iWeightPounds != -1 )
|
if( m_iWeightPounds != -1 )
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ public:
|
|||||||
std::map<RString,RString> m_SetEnv;
|
std::map<RString,RString> m_SetEnv;
|
||||||
RString m_sSongGroup;
|
RString m_sSongGroup;
|
||||||
SortOrder m_SortOrder;
|
SortOrder m_SortOrder;
|
||||||
RString m_sUnlockEntryID; // "" for no unlock
|
|
||||||
RString m_sSoundPath; // "" for no sound
|
RString m_sSoundPath; // "" for no sound
|
||||||
vector<RString> m_vsScreensToPrepare;
|
vector<RString> m_vsScreensToPrepare;
|
||||||
int m_iWeightPounds; // -1 == none specified
|
int m_iWeightPounds; // -1 == none specified
|
||||||
|
|||||||
Reference in New Issue
Block a user