Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -22,7 +22,7 @@ void ScreenContinue::Init()

 void ScreenContinue::BeginScreen()
 {
-	GAMESTATE->SetCurrentStyle( NULL, PLAYER_INVALID );
+	GAMESTATE->SetCurrentStyle( nullptr, PLAYER_INVALID );

 	// Unjoin human players with 0 stages left and reset non-human players.
 	// We need to reset non-human players because data in non-human (CPU)