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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEditMenu.cpp
+9 -9
View File
@@ -32,7 +32,7 @@ REGISTER_SCREEN_CLASS( ScreenEditMenu );
void ScreenEditMenu::Init()
{
// HACK: Disable any style set by the editor.
GAMESTATE->SetCurrentStyle( NULL, PLAYER_INVALID );
GAMESTATE->SetCurrentStyle( nullptr, PLAYER_INVALID );
// Enable all players.
FOREACH_PlayerNumber( pn )
@@ -91,7 +91,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1];
FOREACH_PlayerNumber(pn)
{
GAMESTATE->m_pCurSteps[pn].Set(NULL);
GAMESTATE->m_pCurSteps[pn].Set(nullptr);
}
bool bSaveSong = !pStepsToDelete->WasLoadedFromProfile();
pSong->DeleteSteps( pStepsToDelete );
@@ -174,7 +174,7 @@ static void SetCurrentStepsDescription( const RString &s )
static void DeleteCurrentSteps()
{
GAMESTATE->m_pCurSong->DeleteSteps( GAMESTATE->m_pCurSteps[0] );
GAMESTATE->m_pCurSteps[0].Set( NULL );
GAMESTATE->m_pCurSteps[0].Set(nullptr);
}
static LocalizedString MISSING_MUSIC_FILE ( "ScreenEditMenu", "This song is missing a music file and cannot be edited." );
@@ -216,7 +216,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
}
GAMESTATE->m_pCurSong.Set( pSong );
GAMESTATE->m_pCurCourse.Set( NULL );
GAMESTATE->m_pCurCourse.Set( nullptr );
GAMESTATE->SetCurrentStyle( GAMEMAN->GetEditorStyleForStepsType(st), PLAYER_INVALID );
GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps );
@@ -252,7 +252,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
{
case EditMenuAction_Delete:
{
ASSERT( pSteps != NULL );
ASSERT( pSteps != nullptr );
if( pSteps->IsAutogen() )
{
SCREENMAN->PlayInvalidSound();
@@ -270,7 +270,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
case EditMenuAction_Practice:
break;
case EditMenuAction_Delete:
ASSERT( pSteps != NULL );
ASSERT( pSteps != nullptr );
ScreenPrompt::Prompt( SM_None, STEPS_WILL_BE_LOST.GetValue() + "\n\n" + CONTINUE_WITH_DELETE.GetValue(),
PROMPT_YES_NO, ANSWER_NO );
break;
@@ -279,7 +279,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
{
FOREACH_PlayerNumber(pn)
{
GAMESTATE->m_pCurSteps[pn].Set(NULL);
GAMESTATE->m_pCurSteps[pn].Set(nullptr);
}
pSong->LoadAutosaveFile();
SONGMAN->Invalidate(pSong);
@@ -327,7 +327,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
GAMESTATE->m_pCurSong.Set( pSong );
GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps );
GAMESTATE->m_pCurCourse.Set( NULL );
GAMESTATE->m_pCurCourse.Set(nullptr);
}
break;
default:
@@ -342,7 +342,7 @@ bool ScreenEditMenu::MenuStart( const InputEventPlus & )
case EditMenuAction_Practice:
{
// Prepare for ScreenEdit
ASSERT( pSteps != NULL );
ASSERT( pSteps != nullptr );
bool bPromptToNameSteps = (action == EditMenuAction_Create && dc == Difficulty_Edit);
if( bPromptToNameSteps )
{