From 226911828a68bc06be64d7767959a8eed3915e48 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 24 May 2007 23:16:02 +0000 Subject: [PATCH] remove "unlock"; do this with Lua: UNLOCKMAN:UnlockEntryID --- stepmania/src/GameCommand.cpp | 10 +++------- stepmania/src/GameCommand.h | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 5351e61217..a5f79f7735 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -52,7 +52,6 @@ void GameCommand::Init() m_pTrail = NULL; m_pCharacter = NULL; m_SortOrder = SortOrder_Invalid; - m_sUnlockEntryID = ""; m_sSoundPath = ""; m_vsScreensToPrepare.clear(); m_iWeightPounds = -1; @@ -355,10 +354,6 @@ void GameCommand::LoadOne( const Command& cmd ) { m_sUrl = sValue; } - else if( sName == "unlock" ) - { - m_sUnlockEntryID = sValue; - } else if( sName == "sound" ) { @@ -690,6 +685,9 @@ void GameCommand::ApplySelf( const vector &vpns ) const SCREENMAN->SetNewScreen( m_sScreen ); if( m_pSong ) { + LOG->Trace( "set %p, %s", + m_pSong, m_pSong->GetTranslitFullTitle().c_str() ); + GAMESTATE->m_pCurSong.Set( m_pSong ); GAMESTATE->m_pPreferredSong = m_pSong; } @@ -724,8 +722,6 @@ void GameCommand::ApplySelf( const vector &vpns ) const GAMESTATE->m_sPreferredSongGroup.Set( m_sSongGroup ); if( m_SortOrder != SortOrder_Invalid ) GAMESTATE->m_PreferredSortOrder = m_SortOrder; - if( !m_sUnlockEntryID.empty() ) - UNLOCKMAN->UnlockEntryID( m_sUnlockEntryID ); if( m_sSoundPath != "" ) SOUND->PlayOnce( THEME->GetPathS( "", m_sSoundPath ) ); if( m_iWeightPounds != -1 ) diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h index 4b258d1768..ecf0dba236 100644 --- a/stepmania/src/GameCommand.h +++ b/stepmania/src/GameCommand.h @@ -72,7 +72,6 @@ public: std::map m_SetEnv; RString m_sSongGroup; SortOrder m_SortOrder; - RString m_sUnlockEntryID; // "" for no unlock RString m_sSoundPath; // "" for no sound vector m_vsScreensToPrepare; int m_iWeightPounds; // -1 == none specified