actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/ScreenOptionsCourseOverview.cpp
+11 -11
View File
@@ -32,19 +32,19 @@ enum CourseOverviewRow
static bool CurrentCourseIsSaved()
{
Course *pCourse = GAMESTATE->m_pCurCourse;
if( pCourse == NULL )
if( pCourse == nullptr )
return false;
return !pCourse->m_sPath.empty();
}
static const MenuRowDef g_MenuRows[] =
{
MenuRowDef( -1, "Play", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Edit Course", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Shuffle", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Rename", CurrentCourseIsSaved, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Delete", CurrentCourseIsSaved, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Save", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Play", true, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Edit Course", true, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Shuffle", true, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Rename", CurrentCourseIsSaved, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Delete", CurrentCourseIsSaved, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Save", true, EditMode_Practice, true, false, 0, nullptr ),
};
REGISTER_SCREEN_CLASS( ScreenOptionsCourseOverview );
@@ -88,7 +88,7 @@ void ScreenOptionsCourseOverview::BeginScreen()
ScreenOptions::BeginScreen();
// clear the current song in case it's set when we back out from gameplay
GAMESTATE->m_pCurSong.Set( NULL );
GAMESTATE->m_pCurSong.Set(nullptr);
}
ScreenOptionsCourseOverview::~ScreenOptionsCourseOverview()
@@ -115,7 +115,7 @@ void ScreenOptionsCourseOverview::HandleScreenMessage( const ScreenMessage SM )
if( SM == SM_GoToPrevScreen )
{
// If we're pointing to an unsaved course, it will be inaccessible once we're back on ScreenOptionsManageCourses.
GAMESTATE->m_pCurCourse.Set( NULL );
GAMESTATE->m_pCurCourse.Set(nullptr);
}
else if( SM == SM_GoToNextScreen )
{
@@ -169,8 +169,8 @@ void ScreenOptionsCourseOverview::HandleScreenMessage( const ScreenMessage SM )
return;
}
GAMESTATE->m_pCurCourse.Set( NULL );
GAMESTATE->m_pCurTrail[PLAYER_1].Set( NULL );
GAMESTATE->m_pCurCourse.Set(nullptr);
GAMESTATE->m_pCurTrail[PLAYER_1].Set(nullptr);
/* Our course is gone, so back out. */
StartTransitioningScreen( SM_GoToPrevScreen );