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/ScreenOptionsReviewWorkout.cpp
+5 -5
View File
@@ -29,10 +29,10 @@ enum ReviewWorkoutRow
static const MenuRowDef g_MenuRows[] =
{
MenuRowDef( -1, "Play", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Edit Workout", true, EditMode_Practice, true, false, 0, NULL ),
MenuRowDef( -1, "Shuffle", true, 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 Workout", true, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Shuffle", true, EditMode_Practice, true, false, 0, nullptr ),
MenuRowDef( -1, "Save", true, EditMode_Practice, true, false, 0, nullptr ),
};
REGISTER_SCREEN_CLASS( ScreenOptionsCourseOverview );
@@ -66,7 +66,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()