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
@@ -29,13 +29,13 @@ public:
 protected:
 	void Step( PlayerNumber pn, int CSTEP );

-	NoteData m_NoteData[NUM_PLAYERS];
-	bool m_bPlayerEnabled[NUM_PLAYERS];
-	Model *m_pDancer[NUM_PLAYERS];
+	std::array<NoteData, NUM_PLAYERS> m_NoteData;
+	std::array<bool, NUM_PLAYERS> m_bPlayerEnabled;
+	std::array<Model *, NUM_PLAYERS> m_pDancer;
 	Model *m_pDancePad;
 	Sprite	m_sFlash;
 	AutoActor	m_sBackground;
-	Sprite	m_sStepCircle[NUM_PLAYERS][4];	// More memory, but much easier to manage
+	std::array<std::array<Sprite, 4>, NUM_PLAYERS> m_sStepCircle; // More memory, but much easier to manage.

 	int	m_iLastRowChecked;
 	int	m_iLastRowFlashed;