actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GameCommand] Remove pushscreen

Browse Source 
[ScreenOptionsMasterPrefs] Reset Judge and Life values to the ones in SM4
[ScreenNetEvaluation] add Score, Grade, PlayerOptions params to UpdateNetEvalStats message
[PlayerState] add GetHealthState Lua binding
small cleanup in statsman
This commit is contained in:
AJ Kelly
2010-08-15 15:26:27 -05:00
parent 0de703fb45
commit d0b2a6940d
6 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameCommand.cpp
+3 -14
View File
@@ -59,7 +59,6 @@ void GameCommand::Init()
m_sProfileID = "";
m_sUrl = "";
m_bUrlExits = true;
m_bPushScreen = false;
m_bInsertCredit = false;
m_bClearCredits = false;
@@ -242,7 +241,6 @@ void GameCommand::LoadOne( const Command& cmd )
else if( sName == "screen" )
{
m_sScreen = sValue;
m_bPushScreen = false;
}
else if( sName == "song" )
@@ -412,12 +410,6 @@ void GameCommand::LoadOne( const Command& cmd )
}
}
else if( sName == "pushscreen" )
{
m_sScreen = sValue;
m_bPushScreen = true;
}
else if( sName == "fademusic" )
{
// todo: parse things correctly. -aj
@@ -573,7 +565,7 @@ bool GameCommand::IsPlayable( RString *why ) const
}
}
if( !m_sScreen.CompareNoCase("ScreenEditCoursesMenu") && !m_bPushScreen )
if( !m_sScreen.CompareNoCase("ScreenEditCoursesMenu") )
{
vector<Course*> vCourses;
SONGMAN->GetAllCourses( vCourses, false );
@@ -588,8 +580,7 @@ bool GameCommand::IsPlayable( RString *why ) const
if( (!m_sScreen.CompareNoCase("ScreenJukeboxMenu") ||
!m_sScreen.CompareNoCase("ScreenEditMenu") ||
!m_sScreen.CompareNoCase("ScreenEditCoursesMenu")) &&
!m_bPushScreen)
!m_sScreen.CompareNoCase("ScreenEditCoursesMenu")) )
{
if( SONGMAN->GetNumSongs() == 0 )
{
@@ -727,10 +718,8 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
}
LUA->Release(L);
}
if( m_sScreen != "" && m_bApplyCommitsScreens && !m_bPushScreen )
if( m_sScreen != "" && m_bApplyCommitsScreens )
SCREENMAN->SetNewScreen( m_sScreen );
if( m_sScreen != "" && m_bApplyCommitsScreens && m_bPushScreen )
SCREENMAN->AddNewScreenToTop( m_sScreen );
if( m_pSong )
{
GAMESTATE->m_pCurSong.Set( m_pSong );