[Stepmania-cvs] stepmania/src ActorFrame.h,1.11,1.12 Background.cpp,1.88,1.89 Background.h,1.27,1.28 BGAnimation.h,1.4,1.5 Course.cpp,1.36,1.37 Course.h,1.18,1.19 GameManager.cpp,1.81,1.82 GameManager.h,1.22,1.23 GameState.h,1.21,1.22 GroupList.h,1.3,1.4 InputFilter.h,1.9,1.10 InputQueue.h,1.7,1.8 MenuElements.cpp,1.42,1.43 MusicBannerWheel.h,1.5,1.6 MusicList.cpp,1.11,1.12 MusicList.h,1.2,1.3 MusicWheel.cpp,1.103,1.104 MusicWheel.h,1.46,1.47 NoteData.cpp,1.100,1.101 NoteDisplay.h,1.6,1.7 NoteField.cpp,1.48,1.49 Notes.cpp,1.45,1.46 Notes.h,1.27,1.28 NotesLoaderBMS.cpp,1.22,1.23 RageTexture.h,1.35,1.36 RageUtil.cpp,1.75,1.76 RandomSample.h,1.10,1.11 Screen.h,1.14,1.15 ScreenEvaluation.cpp,1.72,1.73 ScreenEz2SelectMusic.h,1.9,1.10 ScreenGameplay.cpp,1.117,1.118 ScreenManager.h,1.10,1.11 ScreenMusicScroll.cpp,1.42,1.43 ScreenSelectGame.cpp,1.24,1.25 ScreenSelectGroup.cpp,1.47,1.48 ScreenSelectMode.h,1.7,1.8 ScreenSelectMusic.cpp,1.68,1.69 ScreenSelectMusic.h,1.18,1.19 ScreenSelectStyle.h,1.10,1.11 ScrollingList.h,1.4,1.5 Song.cpp,1.153,1.154 song.h,1.74,1.75 SongManager.cpp,1.79,1.80 SongManager.h,1.30,1.31 SongSelector.h,1.5,1.6 StdAfx.h,1.30,1.31

[<gma...@us...>]

Update of /cvsroot/stepmania/stepmania/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15458

Modified Files:
	ActorFrame.h Background.cpp Background.h BGAnimation.h 
	Course.cpp Course.h GameManager.cpp GameManager.h GameState.h 
	GroupList.h InputFilter.h InputQueue.h MenuElements.cpp 
	MusicBannerWheel.h MusicList.cpp MusicList.h MusicWheel.cpp 
	MusicWheel.h NoteData.cpp NoteDisplay.h NoteField.cpp 
	Notes.cpp Notes.h NotesLoaderBMS.cpp RageTexture.h 
	RageUtil.cpp RandomSample.h Screen.h ScreenEvaluation.cpp 
	ScreenEz2SelectMusic.h ScreenGameplay.cpp ScreenManager.h 
	ScreenMusicScroll.cpp ScreenSelectGame.cpp 
	ScreenSelectGroup.cpp ScreenSelectMode.h ScreenSelectMusic.cpp 
	ScreenSelectMusic.h ScreenSelectStyle.h ScrollingList.h 
	Song.cpp song.h SongManager.cpp SongManager.h SongSelector.h 
	StdAfx.h 
Log Message:
s/CArray<x,y>/vector<x>/g


Index: ActorFrame.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ActorFrame.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ActorFrame.h	1 Jan 2003 09:05:21 -0000	1.11
+++ ActorFrame.h	3 Jan 2003 05:56:27 -0000	1.12
@@ -28,7 +28,7 @@
 	virtual float TweenTime() const;
 
 protected:
-	CArray<Actor*,Actor*>	m_SubActors;
+	vector<Actor*>	m_SubActors;
 };
 
 #endif

Index: Background.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Background.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- Background.cpp	30 Dec 2002 02:43:51 -0000	1.88
+++ Background.cpp	3 Jan 2003 05:56:27 -0000	1.89
@@ -39,7 +39,7 @@
 	return seg1.m_fStartBeat < seg2.m_fStartBeat;
 }
 
-void SortBGSegmentArray( CArray<BGSegment,BGSegment&> &arrayBGSegments )
+void SortBGSegmentArray( vector<BGSegment> &arrayBGSegments )
 {
 	sort( arrayBGSegments.begin(), arrayBGSegments.end(), CompareBGSegments );
 }

Index: Background.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Background.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Background.h	16 Nov 2002 08:07:36 -0000	1.27
+++ Background.h	3 Jan 2003 05:56:27 -0000	1.28
@@ -59,8 +59,8 @@
 	BGAnimation		m_BGADanger;
 
 	// used in all BackgroundModes except OFF
-	CArray<BGAnimation*,BGAnimation*> m_BGAnimations;
-	CArray<BGSegment,BGSegment&> m_aBGSegments;
+	vector<BGAnimation*> m_BGAnimations;
+	vector<BGSegment> m_aBGSegments;
 	int m_iCurBGSegment;	// this increases as we move into new segments
 	BGAnimation* GetCurBGA() { int index = m_aBGSegments[m_iCurBGSegment].m_iBGIndex; return m_BGAnimations[index]; };
 	BGAnimation* m_pCurrentBGA;

Index: BGAnimation.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/BGAnimation.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BGAnimation.h	16 Nov 2002 08:07:36 -0000	1.4
+++ BGAnimation.h	3 Jan 2003 05:56:27 -0000	1.5
@@ -42,7 +42,7 @@
 	void LosingFocus();
 
 protected:
-	CArray<BGAnimationLayer*,BGAnimationLayer*> m_Layers;
+	vector<BGAnimationLayer*> m_Layers;
 	float	m_fFadeSeconds;
 };
 

Index: Course.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Course.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Course.cpp	2 Jan 2003 22:10:12 -0000	1.36
+++ Course.cpp	3 Jan 2003 05:56:27 -0000	1.37
@@ -31,7 +31,7 @@
 	m_iExtra = 0;
 }
 
-void Course::LoadFromCRSFile( CString sPath, CArray<Song*,Song*> &apSongs )
+void Course::LoadFromCRSFile( CString sPath, vector<Song*> &apSongs )
 {
 	MsdFile msd;
 	if( !msd.ReadFile(sPath) )
@@ -144,7 +144,7 @@
 }
 
 
-void Course::CreateEndlessCourseFromGroupAndDifficulty( CString sGroupName, Difficulty dc, CArray<Song*,Song*> &apSongsInGroup )
+void Course::CreateEndlessCourseFromGroupAndDifficulty( CString sGroupName, Difficulty dc, vector<Song*> &apSongsInGroup )
 {
 	m_bRepeat = true;
 	m_bRandomize = true;
@@ -241,8 +241,8 @@
 
 /* When bShuffled is true, returns courses in the song ordering list. */
 void Course::GetSongAndNotesForCurrentStyle( 
-	CArray<Song*,Song*>& apSongsOut,
-	CArray<Notes*,Notes*>& apNotesOut, 
+	vector<Song*>& apSongsOut,
+	vector<Notes*>& apNotesOut, 
 	CStringArray& asModifiersOut,
 	bool bShuffled )
 {
@@ -303,7 +303,7 @@
 	return pCourse1->GetNumStages() < pCourse2->GetNumStages();
 }
 
-void SortCoursePointerArrayByDifficulty( CArray<Course*,Course*> &apCourses )
+void SortCoursePointerArrayByDifficulty( vector<Course*> &apCourses )
 {
 	sort( apCourses.begin(), apCourses.end(), CompareCoursePointersByDifficulty );
 }

Index: Course.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Course.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Course.h	17 Dec 2002 05:41:04 -0000	1.18
+++ Course.h	3 Jan 2003 05:56:27 -0000	1.19
@@ -50,11 +50,11 @@
 	void GetSongOptions( SongOptions* pSO_out);
 	int GetNumStages() const;
 
-	void LoadFromCRSFile( CString sPath, CArray<Song*,Song*> &apSongs );
-	void CreateEndlessCourseFromGroupAndDifficulty( CString sGroupName, Difficulty dc, CArray<Song*,Song*> &apSongsInGroup );
+	void LoadFromCRSFile( CString sPath, vector<Song*> &apSongs );
+	void CreateEndlessCourseFromGroupAndDifficulty( CString sGroupName, Difficulty dc, vector<Song*> &apSongsInGroup );
 	void AddStage( Song* pSong, CString sDescription, CString sModifiers );
 
-	void GetSongAndNotesForCurrentStyle( CArray<Song*,Song*>& apSongsOut, CArray<Notes*,Notes*>& apNotesOut, CStringArray& asModifiersOut, bool bShuffled );
+	void GetSongAndNotesForCurrentStyle( vector<Song*>& apSongsOut, vector<Notes*>& apNotesOut, CStringArray& asModifiersOut, bool bShuffled );
 	RageColor	GetColor();
 
 private:
@@ -62,7 +62,7 @@
 };
 
 
-void SortCoursePointerArrayByDifficulty( CArray<Course*,Course*> &apCourses );
+void SortCoursePointerArrayByDifficulty( vector<Course*> &apCourses );
 
 
 #endif

Index: GameManager.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GameManager.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- GameManager.cpp	1 Jan 2003 22:08:05 -0000	1.81
+++ GameManager.cpp	3 Jan 2003 05:56:27 -0000	1.82
@@ -1476,7 +1476,7 @@
 	return &g_StyleDefs[ s ];
 }
 
-void GameManager::GetGameplayStylesForGame( Game game, CArray<Style,Style>& aStylesAddTo, bool editor )
+void GameManager::GetGameplayStylesForGame( Game game, vector<Style>& aStylesAddTo, bool editor )
 {
 	for( int s=0; s<NUM_STYLES; s++ ) {
 		if( g_StyleDefs[s].m_Game != game)
@@ -1490,14 +1490,14 @@
 	}
 }
 
-void GameManager::GetModesChoicesForGame( Game game, CArray<ModeChoice*,ModeChoice*>& apChoicesAddTo )
+void GameManager::GetModesChoicesForGame( Game game, vector<ModeChoice*>& apChoicesAddTo )
 {
 	for( int s=0; s<NUM_MODE_CHOICES; s++ )
 		if( g_ModeChoices[s].game == game)
 			apChoicesAddTo.push_back( &g_ModeChoices[s] );
 }
 
-void GameManager::GetNotesTypesForGame( Game game, CArray<NotesType,NotesType>& aNotesTypeAddTo )
+void GameManager::GetNotesTypesForGame( Game game, vector<NotesType>& aNotesTypeAddTo )
 {
 	for( int nt=0; nt<NUM_NOTES_TYPES; nt++ )
 	{
@@ -1621,7 +1621,7 @@
 	return DerefRedir(arrayPossibleFileNames[0]);
 }
 
-void GameManager::GetEnabledGames( CArray<Game,Game>& aGamesOut )
+void GameManager::GetEnabledGames( vector<Game>& aGamesOut )
 {
 	for( int g=0; g<NUM_GAMES; g++ )
 	{

Index: GameManager.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GameManager.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- GameManager.h	16 Nov 2002 08:07:36 -0000	1.22
+++ GameManager.h	3 Jan 2003 05:56:27 -0000	1.23
@@ -28,9 +28,9 @@
 	GameDef*	GetGameDefForGame( Game g );
 	const StyleDef*	GetStyleDefForStyle( Style s );
 
-	void		GetGameplayStylesForGame( Game game, CArray<Style,Style>& aStylesAddTo, bool editor=false );
-	void		GetModesChoicesForGame( Game game, CArray<ModeChoice*,ModeChoice*>& apChoicesAddTo );
-	void		GetNotesTypesForGame( Game game, CArray<NotesType,NotesType>& aNotesTypeAddTo );	// only look at edit-specific styles
+	void		GetGameplayStylesForGame( Game game, vector<Style>& aStylesAddTo, bool editor=false );
+	void		GetModesChoicesForGame( Game game, vector<ModeChoice*>& apChoicesAddTo );
+	void		GetNotesTypesForGame( Game game, vector<NotesType>& aNotesTypeAddTo );	// only look at edit-specific styles
 
 //	void GetGameNames( CStringArray &AddTo );
 //	bool DoesGameExist( CString sGameName );
@@ -52,7 +52,7 @@
 	RageColor	GetMetricC( CString sClassName, CString sValueName );
 
 
-	void GetEnabledGames( CArray<Game,Game>& aGamesOut );
+	void GetEnabledGames( vector<Game>& aGamesOut );
 
 	static int NotesTypeToNumTracks( NotesType nt );
 	static NotesType StringToNotesType( CString sNotesType );

Index: GameState.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GameState.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- GameState.h	2 Dec 2002 05:25:41 -0000	1.21
+++ GameState.h	3 Jan 2003 05:56:27 -0000	1.22
@@ -126,7 +126,7 @@
 	//
 	// Session Statistics: Arcade: 3 songs.  Oni/Endless: one course.
 	//
-	CArray<Song*,Song*>	m_apSongsPlayed;	// an array of completed songs.  
+	vector<Song*>	m_apSongsPlayed;	// an array of completed songs.  
 											// This is useful for the final evaluation screen,
 											// and used to calculate the time into a course
 

Index: GroupList.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GroupList.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GroupList.h	16 Nov 2002 08:55:46 -0000	1.3
+++ GroupList.h	3 Jan 2003 05:56:27 -0000	1.4
@@ -10,7 +10,7 @@
 class GroupList: public ActorFrame {
 	Sprite			m_sprButton[MAX_GROUPS_ONSCREEN];
 	BitmapText		m_screenLabels[MAX_GROUPS_ONSCREEN];
-	CArray<CString,CString> m_textLabels;
+	vector<CString> m_textLabels;
 
 	/* Currently selected label. */
 	unsigned m_iSelection;

Index: InputFilter.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/InputFilter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- InputFilter.h	16 Nov 2002 08:07:37 -0000	1.9
+++ InputFilter.h	3 Jan 2003 05:56:27 -0000	1.10
@@ -34,7 +34,7 @@
 	InputEventType type;
 };
 
-typedef CArray<InputEvent, InputEvent> InputEventArray;
+typedef vector<InputEvent> InputEventArray;
 
 class InputFilter
 {

Index: InputQueue.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/InputQueue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- InputQueue.h	16 Nov 2002 08:07:37 -0000	1.7
+++ InputQueue.h	3 Jan 2003 05:56:27 -0000	1.8
@@ -34,7 +34,7 @@
 		GameButton	button;
 		float		fTime;
 	};
-	CArray<GameButtonAndTime,GameButtonAndTime> m_aQueue[MAX_GAME_CONTROLLERS];
+	vector<GameButtonAndTime> m_aQueue[MAX_GAME_CONTROLLERS];
 };
 
 

Index: MenuElements.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MenuElements.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- MenuElements.cpp	2 Jan 2003 07:52:20 -0000	1.42
+++ MenuElements.cpp	3 Jan 2003 05:56:27 -0000	1.43
@@ -124,7 +124,7 @@
 	if(tm == -1)
 		tm = MENU_ELEMENTS_TWEEN_TIME;
 
-	CArray<Actor*,Actor*> apActorsInTopFrame;
+	vector<Actor*> apActorsInTopFrame;
 	apActorsInTopFrame.push_back( &m_sprTopEdge );
 	apActorsInTopFrame.push_back( &m_sprStyleIcon );
 	apActorsInTopFrame.push_back( &m_MenuTimer );
@@ -162,7 +162,7 @@
  bounce faster.  SCREEN_WIDTH+SCREEN_WIDTH/2 would, but ignoring fOriginalX
  will make each component tween off at a different rate ...
  -glenn
-	CArray<Actor*,Actor*> apActorsInTopFrame;
+	vector<Actor*> apActorsInTopFrame;
 	apActorsInTopFrame.push_back( &m_sprTopEdge );
 	apActorsInTopFrame.push_back( &m_sprStyleIcon );
 	apActorsInTopFrame.push_back( &m_MenuTimer );

Index: MusicBannerWheel.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MusicBannerWheel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MusicBannerWheel.h	31 Dec 2002 03:09:58 -0000	1.5
+++ MusicBannerWheel.h	3 Jan 2003 05:56:27 -0000	1.6
@@ -46,7 +46,7 @@
 	int SongsExist;
 	int SingleLoad;
 
-	CArray<Song*, Song*> arraySongs;
+	vector<Song*> arraySongs;
 };
 
 #endif

Index: MusicList.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MusicList.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MusicList.cpp	31 Oct 2002 04:23:35 -0000	1.11
+++ MusicList.cpp	3 Jan 2003 05:56:27 -0000	1.12
@@ -34,7 +34,7 @@
 	m_ContentsText.push_back(group());
 }
 
-void MusicList::AddSongsToGroup(const CArray<Song*,Song*> &Songs)
+void MusicList::AddSongsToGroup(const vector<Song*> &Songs)
 {
 	// Generate what text will show in the contents for each group
 	unsigned group = m_ContentsText.size()-1;

Index: MusicList.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MusicList.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MusicList.h	16 Nov 2002 08:55:46 -0000	1.2
+++ MusicList.h	3 Jan 2003 05:56:27 -0000	1.3
@@ -15,7 +15,7 @@
 		int m_iNumSongsInGroup;
 	};
 
-	CArray<group,group> m_ContentsText;
+	vector<group> m_ContentsText;
 
 	int NumGroups, CurGroup;
 	
@@ -26,7 +26,7 @@
 	void AddGroup();
 
 	/* Add songs to the group that was just added. */
-	void AddSongsToGroup(const CArray<Song*,Song*> &songs);
+	void AddSongsToGroup(const vector<Song*> &songs);
 
 	/* Set the displayed group number. */
 	void SetGroupNo(int group);

Index: MusicWheel.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MusicWheel.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- MusicWheel.cpp	3 Jan 2003 05:29:45 -0000	1.103
+++ MusicWheel.cpp	3 Jan 2003 05:56:27 -0000	1.104
@@ -334,7 +334,7 @@
 
 	// init m_mapGroupNameToBannerColor
 
-	CArray<Song*, Song*> arraySongs = SONGMAN->m_pSongs;
+	vector<Song*> arraySongs = SONGMAN->m_pSongs;
 	SortSongPointerArrayByGroup( arraySongs );
 	
 	m_iSelection = 0;
@@ -392,7 +392,7 @@
 			 * This will select songs we can't use; we want the first song
 			 * that's actually visible.  Should we select out of wheel data? 
 			 * -glenn */
-			CArray<Song*, Song*> arraySongs;
+			vector<Song*> arraySongs;
 			SONGMAN->GetSongsInGroup( asGroupNames[0], arraySongs );
 			if( !arraySongs.empty() ) // still nothing selected
 				GAMESTATE->m_pCurSong = arraySongs[0];	// select the first song
@@ -471,7 +471,7 @@
 	return true;
 }
 
-void MusicWheel::GetSongList(CArray<Song*, Song*> &arraySongs, bool bRoulette )
+void MusicWheel::GetSongList(vector<Song*> &arraySongs, bool bRoulette )
 {
 	// copy only songs that have at least one Notes for the current GameMode
 	for( unsigned i=0; i<SONGMAN->m_pSongs.size(); i++ )
@@ -489,7 +489,7 @@
 				continue;
 		}
 
-		CArray<Notes*, Notes*> arraySteps;
+		vector<Notes*> arraySteps;
 		pSong->GetNotesThatMatch( GAMESTATE->GetCurrentStyleDef()->m_NotesType, arraySteps );
 
 		if( !arraySteps.empty() )
@@ -511,7 +511,7 @@
 			///////////////////////////////////
 			// Make an array of Song*, then sort them
 			///////////////////////////////////
-			CArray<Song*, Song*> arraySongs;
+			vector<Song*> arraySongs;
 			
 			GetSongList(arraySongs, so == SORT_ROULETTE);
 
@@ -634,7 +634,7 @@
 		{
 			unsigned i;
 
-			CArray<Course*,Course*> apCourses;
+			vector<Course*> apCourses;
 			switch( GAMESTATE->m_PlayMode )
 			{
 			case PLAY_MODE_ONI:
@@ -653,8 +653,8 @@
 				Course* pCourse = apCourses[c];
 
 				// check that this course has at least one song playable in the current style
-				CArray<Song*,Song*> apSongs;
-				CArray<Notes*,Notes*> apNotes;
+				vector<Song*> apSongs;
+				vector<Notes*> apNotes;
 				CStringArray asModifiers;
 				pCourse->GetSongAndNotesForCurrentStyle( apSongs, apNotes, asModifiers, false );
 

Index: MusicWheel.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/MusicWheel.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- MusicWheel.h	3 Jan 2003 03:24:00 -0000	1.46
+++ MusicWheel.h	3 Jan 2003 05:56:27 -0000	1.47
@@ -41,7 +41,7 @@
 struct WheelItemData
 {
 public:
-	WheelItemData() {};	// this is needed to use a CArray of these
+	WheelItemData() {}
 	WheelItemData( WheelItemType wit, Song* pSong, const CString &sSectionName, Course* pCourse, const RageColor color );
 
 	WheelItemType	m_WheelItemType;
@@ -123,7 +123,7 @@
 	bool WheelIsLocked() { return (m_WheelState == STATE_LOCKED ? true : false); }
 
 protected:
-	void GetSongList(CArray<Song*, Song*> &arraySongs, bool bRoulette );
+	void GetSongList(vector<Song*> &arraySongs, bool bRoulette );
 	void BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItems, SongSortOrder so );
 	void RebuildWheelItemDisplays();
 	void SetOpenGroup(CString group, SongSortOrder so = NUM_SORT_ORDERS);

Index: NoteData.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/NoteData.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- NoteData.cpp	3 Jan 2003 05:29:45 -0000	1.100
+++ NoteData.cpp	3 Jan 2003 05:56:27 -0000	1.101
@@ -853,7 +853,7 @@
 	case PlayerOptions::TURN_SHUFFLE:
 	case PlayerOptions::TURN_SUPER_SHUFFLE:		// use this code to shuffle the HoldNotes
 		{
-			CArray<int,int> aiTracksLeftToMap;
+			vector<int> aiTracksLeftToMap;
 			for( t=0; t<in.m_iNumTracks; t++ )
 				aiTracksLeftToMap.push_back( t );
 			
@@ -913,7 +913,7 @@
 				continue;	// no need to super shuffle this row
 
 			// shuffle this row
-			CArray<int,int> aiTracksThatCouldHaveTapNotes;
+			vector<int> aiTracksThatCouldHaveTapNotes;
 			for( t=0; t<in.m_iNumTracks; t++ )
 				if( in.GetTapNote(t, r) != TAP_HOLD )	// any point that isn't part of a hold
 					aiTracksThatCouldHaveTapNotes.push_back( t );

Index: NoteDisplay.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/NoteDisplay.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NoteDisplay.h	16 Nov 2002 08:07:37 -0000	1.6
+++ NoteDisplay.h	3 Jan 2003 05:56:27 -0000	1.7
@@ -37,7 +37,7 @@
 	Sprite		m_sprTapParts;		// for now, must be an even number of frames
 	Sprite		m_sprHoldParts;		// for now, must be 8 frames
 
-	CArray<RageColor,RageColor> m_colorTapTweens;
+	vector<RageColor> m_colorTapTweens;
 };
 
 #endif

Index: NoteField.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/NoteField.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- NoteField.cpp	19 Dec 2002 23:07:20 -0000	1.48
+++ NoteField.cpp	3 Jan 2003 05:56:27 -0000	1.49
@@ -176,21 +176,21 @@
 		//
 		// BPM text
 		//
-		CArray<BPMSegment,BPMSegment&> &aBPMSegments = GAMESTATE->m_pCurSong->m_BPMSegments;
+		vector<BPMSegment> &aBPMSegments = GAMESTATE->m_pCurSong->m_BPMSegments;
 		for( i=0; i<aBPMSegments.size(); i++ )
 			DrawBPMText( aBPMSegments[i].m_fStartBeat, aBPMSegments[i].m_fBPM );
 
 		//
 		// Freeze text
 		//
-		CArray<StopSegment,StopSegment&> &aStopSegments = GAMESTATE->m_pCurSong->m_StopSegments;
+		vector<StopSegment> &aStopSegments = GAMESTATE->m_pCurSong->m_StopSegments;
 		for( i=0; i<aStopSegments.size(); i++ )
 			DrawFreezeText( aStopSegments[i].m_fStartBeat, aStopSegments[i].m_fStopSeconds );
 
 		//
 		// BGChange text
 		//
-		CArray<BackgroundChange,BackgroundChange&> &aBackgroundChanges = GAMESTATE->m_pCurSong->m_BackgroundChanges;
+		vector<BackgroundChange> &aBackgroundChanges = GAMESTATE->m_pCurSong->m_BackgroundChanges;
 		for( i=0; i<aBackgroundChanges.size(); i++ )
 			DrawBGChangeText( aBackgroundChanges[i].m_fStartBeat, aBackgroundChanges[i].m_sBGName );
 

Index: Notes.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Notes.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Notes.cpp	2 Jan 2003 22:10:22 -0000	1.45
+++ Notes.cpp	3 Jan 2003 05:56:27 -0000	1.46
@@ -227,7 +227,7 @@
 	return CompareNotesPointersByMeter( pNotes1, pNotes2 );
 }
 
-void SortNotesArrayByDifficulty( CArray<Notes*,Notes*> &arraySteps )
+void SortNotesArrayByDifficulty( vector<Notes*> &arraySteps )
 {
 	sort( arraySteps.begin(), arraySteps.end(), CompareNotesPointersByDifficulty );
 }

Index: Notes.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Notes.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Notes.h	2 Jan 2003 22:10:24 -0000	1.27
+++ Notes.h	3 Jan 2003 05:56:27 -0000	1.28
@@ -94,6 +94,6 @@
 };
 
 bool CompareNotesPointersByDifficulty(const Notes *pNotes1, const Notes *pNotes2);
-void SortNotesArrayByDifficulty( CArray<Notes*,Notes*> &arrayNotess );
+void SortNotesArrayByDifficulty( vector<Notes*> &arrayNotess );
 
 #endif

Index: NotesLoaderBMS.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/NotesLoaderBMS.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- NotesLoaderBMS.cpp	3 Jan 2003 05:27:45 -0000	1.22
+++ NotesLoaderBMS.cpp	3 Jan 2003 05:56:27 -0000	1.23
@@ -153,7 +153,7 @@
 			int iTrackNum	= atoi( value_name.substr(4,2).c_str() );
 
 			CString &sNoteData = value_data;
-			CArray<bool, bool&> arrayNotes;
+			vector<bool> arrayNotes;
 
 			for( int i=0; i+1<sNoteData.GetLength(); i+=2 )
 			{
@@ -352,7 +352,7 @@
 			int iBMSTrackNo	= atoi( value_name.substr(4,2).c_str() );
 
 			CString sNoteData = value_data;
-			CArray<int, int> arrayNotes;
+			vector<int> arrayNotes;
 
 			for( int i=0; i+1<sNoteData.GetLength(); i+=2 )
 			{

Index: RageTexture.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/RageTexture.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- RageTexture.h	30 Dec 2002 03:35:58 -0000	1.35
+++ RageTexture.h	3 Jan 2003 05:56:27 -0000	1.36
@@ -103,7 +103,7 @@
 	int		m_iTextureWidth,	m_iTextureHeight;	// dimensions of the texture in memory
 	int		m_iImageWidth,		m_iImageHeight;		// dimensions of the image in the texture
 	int		m_iFramesWide,		m_iFramesHigh;		// The number of frames of animation in each row and column of this texture
-	CArray<RectF,RectF>	m_TextureCoordRects;	// size = m_iFramesWide * m_iFramesHigh
+	vector<RectF>	m_TextureCoordRects;	// size = m_iFramesWide * m_iFramesHigh
 
 	virtual void CreateFrameRects();
 	virtual void GetFrameDimensionsFromFileName( CString sPath, int* puFramesWide, int* puFramesHigh ) const;

Index: RageUtil.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/RageUtil.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- RageUtil.cpp	3 Jan 2003 05:26:15 -0000	1.75
+++ RageUtil.cpp	3 Jan 2003 05:56:27 -0000	1.76
@@ -341,7 +341,7 @@
 	struct CacheEntry {
 		CStringArray files;
 		CStringArray exts;
-		CArray<int,int> Attributes;
+		vector<int> Attributes;
 
 		CString dir;
 	};
@@ -354,7 +354,7 @@
 	CacheEntry *LoadDirCache( const CString &sPath );
 
 	/* We don't have too many directories ... XXX - glenn */
-	CArray<CacheEntry *,CacheEntry *> directory_cache;
+	vector<CacheEntry *> directory_cache;
 } static DirectoryCache;
 
 void DirCache::FlushCache()

Index: RandomSample.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/RandomSample.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- RandomSample.h	2 Jan 2003 08:13:33 -0000	1.10
+++ RandomSample.h	3 Jan 2003 05:56:27 -0000	1.11
@@ -39,7 +39,7 @@
 	bool LoadSound( CString sSoundFilePath );
 
 
-	CArray<RageSound*, RageSound*> m_pSamples;
+	vector<RageSound*> m_pSamples;
 	int m_iIndexLastPlayed;
 };
 

Index: Screen.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Screen.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Screen.h	30 Dec 2002 00:13:46 -0000	1.14
+++ Screen.h	3 Jan 2003 05:56:27 -0000	1.15
@@ -49,7 +49,7 @@
 		ScreenMessage SM;  
 		float fDelayRemaining;
 	};
-	CArray<QueuedScreenMessage, QueuedScreenMessage&>	m_QueuedMessages;
+	vector<QueuedScreenMessage>	m_QueuedMessages;
 
 public:
 

Index: ScreenEvaluation.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenEvaluation.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- ScreenEvaluation.cpp	2 Jan 2003 22:10:31 -0000	1.72
+++ ScreenEvaluation.cpp	3 Jan 2003 05:56:27 -0000	1.73
@@ -692,7 +692,7 @@
 	{
 		unsigned i;
 
-		CArray<Actor*,Actor*> apActorsInBonusOrStageInfo;
+		vector<Actor*> apActorsInBonusOrStageInfo;
 		apActorsInBonusOrStageInfo.push_back( &m_sprBonusFrame[p] );
 		for( i=0; i<NUM_RADAR_VALUES; i++ )
 		{
@@ -711,7 +711,7 @@
 			apActorsInBonusOrStageInfo[i]->SetTweenX( fOriginalX );
 		}
 
-		CArray<Actor*,Actor*> apActorsInGradeOrPercentFrame;
+		vector<Actor*> apActorsInGradeOrPercentFrame;
 		apActorsInGradeOrPercentFrame.push_back( &m_sprBonusFrame[p] );
 		apActorsInGradeOrPercentFrame.push_back( &m_sprGradeFrame[p] );
 		apActorsInGradeOrPercentFrame.push_back( &m_Grades[p] );

Index: ScreenEz2SelectMusic.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenEz2SelectMusic.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ScreenEz2SelectMusic.h	2 Jan 2003 08:13:33 -0000	1.9
+++ ScreenEz2SelectMusic.h	3 Jan 2003 05:56:27 -0000	1.10
@@ -51,7 +51,7 @@
 	MusicBannerWheel			m_MusicBannerWheel;
 	MenuElements		m_Menu;
 	FootMeter			m_FootMeter[NUM_PLAYERS];
-	CArray<Notes*, Notes*> m_arrayNotes[NUM_PLAYERS];
+	vector<Notes*>		m_arrayNotes[NUM_PLAYERS];
 	int					m_iSelection[NUM_PLAYERS];
 	bool m_bGoToOptions;
 	bool m_bMadeChoice;

Index: ScreenGameplay.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenGameplay.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- ScreenGameplay.cpp	2 Jan 2003 22:10:35 -0000	1.117
+++ ScreenGameplay.cpp	3 Jan 2003 05:56:27 -0000	1.118
@@ -142,8 +142,8 @@
 				GAMESTATE->m_iPossibleDancePoints[p] = 0;
 
 				Course* pCourse = GAMESTATE->m_pCurCourse;
-				CArray<Song*,Song*> apSongs;
-				CArray<Notes*,Notes*> apNotes;
+				vector<Song*> apSongs;
+				vector<Notes*> apNotes;
 				CStringArray asModifiers;
 				pCourse->GetSongAndNotesForCurrentStyle( apSongs, apNotes, asModifiers, true );
 
@@ -502,8 +502,8 @@
 			if( pCourse->m_bRepeat )
 				return false;
 
-			CArray<Song*,Song*> apSongs;
-			CArray<Notes*,Notes*> apNotes;
+			vector<Song*> apSongs;
+			vector<Notes*> apNotes;
 			CStringArray asModifiers;
 			pCourse->GetSongAndNotesForCurrentStyle( apSongs, apNotes, asModifiers, true );
 
@@ -536,8 +536,8 @@
 					GAMESTATE->m_SelectedOptions[p] = GAMESTATE->m_PlayerOptions[p];
 			}
 			Course* pCourse = GAMESTATE->m_pCurCourse;
-			CArray<Song*,Song*> apSongs;
-			CArray<Notes*,Notes*> apNotes;
+			vector<Song*> apSongs;
+			vector<Notes*> apNotes;
 			CStringArray asModifiers;
 
 			pCourse->GetSongAndNotesForCurrentStyle( apSongs, apNotes, asModifiers, true );
@@ -1501,7 +1501,7 @@
 {
 	unsigned i, p;
 
-	CArray<Actor*,Actor*> apActorsInLifeFrame;
+	vector<Actor*> apActorsInLifeFrame;
 	apActorsInLifeFrame.push_back(	&m_sprLifeFrame );
 	for( p=0; p<NUM_PLAYERS; p++ )
 		apActorsInLifeFrame.push_back(	m_pLifeMeter[p] );
@@ -1519,7 +1519,7 @@
 	}
 
 
-	CArray<Actor*,Actor*> apActorsInScoreFrame;
+	vector<Actor*> apActorsInScoreFrame;
 	apActorsInScoreFrame.push_back( &m_sprScoreFrame );
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{

Index: ScreenManager.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenManager.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ScreenManager.h	16 Nov 2002 08:07:37 -0000	1.10
+++ ScreenManager.h	3 Jan 2003 05:56:27 -0000	1.11
@@ -46,8 +46,8 @@
 	void RefreshCreditsMessages();
 
 private:
-	CArray<Screen*, Screen*> m_ScreenStack;
-	CArray<Screen*, Screen*> m_ScreensToDelete;
+	vector<Screen*> m_ScreenStack;
+	vector<Screen*> m_ScreensToDelete;
 	Screen *m_ScreenBuffered;
 
 	BitmapText m_textStats;

Index: ScreenMusicScroll.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenMusicScroll.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ScreenMusicScroll.cpp	2 Jan 2003 08:13:33 -0000	1.42
+++ ScreenMusicScroll.cpp	3 Jan 2003 05:56:27 -0000	1.43
@@ -149,7 +149,7 @@
 	this->AddChild( &m_Background );
 
 
-	CArray<Song*, Song*> arraySongs = SONGMAN->m_pSongs;
+	vector<Song*> arraySongs = SONGMAN->m_pSongs;
 	SortSongPointerArrayByTitle( arraySongs );
 	
 	m_iNumLines = 0;

Index: ScreenSelectGame.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectGame.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ScreenSelectGame.cpp	2 Jan 2003 07:52:21 -0000	1.24
+++ ScreenSelectGame.cpp	3 Jan 2003 05:56:27 -0000	1.25
@@ -42,7 +42,7 @@
 	LOG->Trace( "ScreenSelectGame::ScreenSelectGame()" );
 
 	/* populate g_SelectGameLines */
-	CArray<Game,Game> aGames;
+	vector<Game> aGames;
 	GAMEMAN->GetEnabledGames( aGames );
 	unsigned i;
 	for( i=0; i<aGames.size(); i++ )
@@ -70,7 +70,7 @@
 	/* Search the list of games for the currently active game.  If it's
 	 * not there, we might have set a game and then the user removed its
 	 * note skins; reset it to the first available. */
-	CArray<Game,Game> aGames;
+	vector<Game> aGames;
 	GAMEMAN->GetEnabledGames( aGames );
 	ASSERT(!aGames.empty());
 
@@ -89,7 +89,7 @@
 	// Switch the current style to the frist style of the selected game
 	int iSelection = m_iSelectedOption[0][SG_GAME];
 
-	CArray<Game,Game> aGames;
+	vector<Game> aGames;
 	GAMEMAN->GetEnabledGames( aGames );
 	Game game = aGames[iSelection];
 

Index: ScreenSelectGroup.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectGroup.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- ScreenSelectGroup.cpp	2 Jan 2003 08:13:33 -0000	1.47
+++ ScreenSelectGroup.cpp	3 Jan 2003 05:56:28 -0000	1.48
@@ -83,7 +83,7 @@
 	// This will simply the code a bit, and fix a weird case that 
 	// causes a crash when there are duplicate song names.
 	
-	CArray<Song*, Song*> aAllSongs = SONGMAN->m_pSongs;
+	vector<Song*> aAllSongs = SONGMAN->m_pSongs;
 
 	// Filter out Songs that can't be played by the current Style
 	for( j=aAllSongs.size()-1; j>=0; j-- )		// foreach Song, back to front
@@ -112,7 +112,7 @@
 	// Add songs to the MusicList.
 	for( unsigned g=0; g < asGroupNames.size(); g++ ) /* for each group */
 	{
-		CArray<Song*,Song*> aSongsInGroup;
+		vector<Song*> aSongsInGroup;
 		/* find all songs */
 		for( i=0; i<aAllSongs.size(); i++ )		// foreach Song
 		{

Index: ScreenSelectMode.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectMode.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ScreenSelectMode.h	2 Jan 2003 08:13:33 -0000	1.7
+++ ScreenSelectMode.h	3 Jan 2003 05:56:28 -0000	1.8
@@ -58,7 +58,7 @@
 
 	Sprite m_Infotext[MAX_MODE_CHOICES];
 
-	CArray<ModeChoice*,ModeChoice*> m_apPossibleModeChoices;
+	vector<ModeChoice*> m_apPossibleModeChoices;
 
 	ScrollingList m_ScrollingList;
 	void RefreshModeChoices();

Index: ScreenSelectMusic.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectMusic.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ScreenSelectMusic.cpp	3 Jan 2003 03:40:39 -0000	1.68
+++ ScreenSelectMusic.cpp	3 Jan 2003 05:56:28 -0000	1.69
@@ -334,7 +334,7 @@
 
 	m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
 
-	CArray<Actor*,Actor*> apActorsInScore;
+	vector<Actor*> apActorsInScore;
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
 		apActorsInScore.push_back( &m_sprHighScoreFrame[p] );
@@ -354,7 +354,7 @@
 	if( !SCORE_CONNECTED_TO_MUSIC_WHEEL )
 		return;	// do nothing
 
-	CArray<Actor*,Actor*> apActorsInScore;
+	vector<Actor*> apActorsInScore;
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
 		apActorsInScore.push_back( &m_sprHighScoreFrame[p] );

Index: ScreenSelectMusic.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectMusic.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ScreenSelectMusic.h	2 Jan 2003 08:13:33 -0000	1.18
+++ ScreenSelectMusic.h	3 Jan 2003 05:56:28 -0000	1.19
@@ -54,7 +54,7 @@
 
 	void UpdateOptionsDisplays();
 
-	CArray<Notes*, Notes*> m_arrayNotes[NUM_PLAYERS];
+	vector<Notes*> m_arrayNotes[NUM_PLAYERS];
 	int					m_iSelection[NUM_PLAYERS];
 
 	MenuElements		m_Menu;

Index: ScreenSelectStyle.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenSelectStyle.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ScreenSelectStyle.h	11 Nov 2002 04:53:30 -0000	1.10
+++ ScreenSelectStyle.h	3 Jan 2003 05:56:28 -0000	1.11
@@ -59,7 +59,7 @@
 	RandomSample m_soundSelect;
 
 	int					m_iSelection;
-	CArray<Style,Style>	m_aPossibleStyles;
+	vector<Style>	m_aPossibleStyles;
 
 	Style	GetSelectedStyle() { return m_aPossibleStyles[m_iSelection]; };
 };

Index: ScrollingList.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScrollingList.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ScrollingList.h	10 Dec 2002 23:16:44 -0000	1.4
+++ ScrollingList.h	3 Jan 2003 05:56:28 -0000	1.5
@@ -44,8 +44,8 @@
 	float					m_fSelectionLag;
 	int						m_iSpacing;
 	int						m_iNumVisible;
-	CArray<Sprite*,Sprite*>	m_apSprites;	// stores the list of elements (left to right)
-	CArray<CroppedSprite*,CroppedSprite*>	m_apCSprites;	// stores the list of elements (left to right)
+	vector<Sprite*>	m_apSprites;	// stores the list of elements (left to right)
+	vector<CroppedSprite*>	m_apCSprites;	// stores the list of elements (left to right)
 };
 
 #endif

Index: Song.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/Song.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- Song.cpp	3 Jan 2003 05:27:45 -0000	1.153
+++ Song.cpp	3 Jan 2003 05:56:28 -0000	1.154
@@ -46,7 +46,7 @@
 	return seg1.m_fStartBeat < seg2.m_fStartBeat;
 }
 
-void SortBPMSegmentsArray( CArray<BPMSegment,BPMSegment&> &arrayBPMSegments )
+void SortBPMSegmentsArray( vector<BPMSegment> &arrayBPMSegments )
 {
 	sort( arrayBPMSegments.begin(), arrayBPMSegments.end(), CompareBPMSegments );
 }
@@ -56,7 +56,7 @@
 	return seg1.m_fStartBeat < seg2.m_fStartBeat;
 }
 
-void SortStopSegmentsArray( CArray<StopSegment,StopSegment&> &arrayStopSegments )
+void SortStopSegmentsArray( vector<StopSegment> &arrayStopSegments )
 {
 	sort( arrayStopSegments.begin(), arrayStopSegments.end(), CompareStopSegments );
 }
@@ -66,7 +66,7 @@
 	return seg1.m_fStartBeat < seg2.m_fStartBeat;
 }
 
-void SortBackgroundChangesArray( CArray<BackgroundChange,BackgroundChange&> &arrayBackgroundChanges )
+void SortBackgroundChangesArray( vector<BackgroundChange> &arrayBackgroundChanges )
 {
 	sort( arrayBackgroundChanges.begin(), arrayBackgroundChanges.end(), CompareBackgroundChanges );
 }
@@ -551,7 +551,7 @@
 	// a NotesType and it's "smaniac", then convert it to "Challenge"
 	for( NotesType nt=(NotesType)0; nt<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
 	{
-		CArray<Notes*,Notes*> apNotes;
+		vector<Notes*> apNotes;
 		GetNotesThatMatch( nt, apNotes );
 		if( apNotes.size() == 1 )
 		{
@@ -601,7 +601,7 @@
 
 }
 
-void Song::GetNotesThatMatch( NotesType nt, CArray<Notes*, Notes*>& arrayAddTo ) const
+void Song::GetNotesThatMatch( NotesType nt, vector<Notes*>& arrayAddTo ) const
 {
 	for( unsigned i=0; i<m_apNotes.size(); i++ )	// for each of the Song's Notes
 	{
@@ -712,7 +712,7 @@
 
 		for( NotesType nt=(NotesType)0; nt<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
 		{
-			CArray<Notes*,Notes*> apNotes;
+			vector<Notes*> apNotes;
 			this->GetNotesThatMatch( nt, apNotes );
 
 			if(apNotes.empty() || apNotes[0]->IsAutogen())
@@ -751,7 +751,7 @@
 Grade Song::GetGradeForDifficulty( const StyleDef *st, int p, Difficulty dc ) const
 {
 	// return max grade of notes in difficulty class
-	CArray<Notes*, Notes*> aNotes;
+	vector<Notes*> aNotes;
 	this->GetNotesThatMatch( st->m_NotesType, aNotes );
 	SortNotesArrayByDifficulty( aNotes );
 
@@ -804,15 +804,15 @@
 	return pSong1->GetSongFilePath().CompareNoCase(pSong2->GetSongFilePath()) < 0;
 }
 
-void SortSongPointerArrayByTitle( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByTitle( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByTitle );
 }
 
 int CompareSongPointersByDifficulty(const Song *pSong1, const Song *pSong2)
 {
-	CArray<Notes*,Notes*> aNotes1;
-	CArray<Notes*,Notes*> aNotes2;
+	vector<Notes*> aNotes1;
+	vector<Notes*> aNotes2;
 
 	pSong1->GetNotesThatMatch( GAMESTATE->GetCurrentStyleDef()->m_NotesType, aNotes1 );
 	pSong2->GetNotesThatMatch( GAMESTATE->GetCurrentStyleDef()->m_NotesType, aNotes2 );
@@ -833,7 +833,7 @@
 	return CompareSongPointersByTitle( pSong1, pSong2 );
 }
 
-void SortSongPointerArrayByDifficulty( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByDifficulty( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByDifficulty );
 }
@@ -852,7 +852,7 @@
 	return CompareCStringsAsc( pSong1->GetSongFilePath(), pSong2->GetSongFilePath() );
 }
 
-void SortSongPointerArrayByBPM( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByBPM( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByBPM );
 }
@@ -870,7 +870,7 @@
 	return CompareSongPointersByTitle( pSong1, pSong2 );
 }
 
-void SortSongPointerArrayByArtist( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByArtist( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByArtist );
 }
@@ -889,7 +889,7 @@
 	return CompareSongPointersByDifficulty( pSong1, pSong2 );
 }
 
-void SortSongPointerArrayByGroup( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByGroup( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByGroup );
 }
@@ -906,7 +906,7 @@
 	return CompareSongPointersByTitle( pSong1, pSong2 );
 }
 
-void SortSongPointerArrayByMostPlayed( CArray<Song*, Song*> &arraySongPointers )
+void SortSongPointerArrayByMostPlayed( vector<Song*> &arraySongPointers )
 {
 	sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByMostPlayed );
 }

Index: song.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/song.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- song.h	3 Jan 2003 05:27:45 -0000	1.74
+++ song.h	3 Jan 2003 05:56:28 -0000	1.75
@@ -143,9 +143,9 @@
 	bool HasMovieBackground() const;
 	bool HasBGChanges() const;
 
-	CArray<BPMSegment, BPMSegment&> m_BPMSegments;	// this must be sorted before gameplay
-	CArray<StopSegment, StopSegment&> m_StopSegments;	// this must be sorted before gameplay
-	CArray<BackgroundChange, BackgroundChange&> m_BackgroundChanges;	// this must be sorted before gameplay
+	vector<BPMSegment> m_BPMSegments;	// this must be sorted before gameplay
+	vector<StopSegment> m_StopSegments;	// this must be sorted before gameplay
+	vector<BackgroundChange> m_BackgroundChanges;	// this must be sorted before gameplay
 
 	void AddBPMSegment( BPMSegment seg );
 	void AddStopSegment( StopSegment seg );
@@ -198,12 +198,12 @@
 	
 	
 	
-	CArray<Notes*, Notes*> m_apNotes;
+	vector<Notes*> m_apNotes;
 
 	bool SongCompleteForStyle( const StyleDef *st ) const;
 	bool SongHasNotesType( NotesType nt ) const;
 	bool SongHasNotesTypeAndDifficulty( NotesType nt, Difficulty dc ) const;
-	void GetNotesThatMatch( NotesType nt, CArray<Notes*, Notes*>& arrayAddTo ) const;
+	void GetNotesThatMatch( NotesType nt, vector<Notes*>& arrayAddTo ) const;
 	int GetNumTimesPlayed() const;
 	bool IsNew() const;
 	bool IsEasy( NotesType nt ) const;
@@ -213,12 +213,12 @@
 };
 
 
-void SortSongPointerArrayByDifficulty( CArray<Song*, Song*> &arraySongPointers );
-void SortSongPointerArrayByTitle( CArray<Song*, Song*> &arraySongPointers );
-void SortSongPointerArrayByBPM( CArray<Song*, Song*> &arraySongPointers );
-void SortSongPointerArrayByArtist( CArray<Song*, Song*> &arraySongPointers );
-void SortSongPointerArrayByGroup( CArray<Song*, Song*> &arraySongPointers );
-void SortSongPointerArrayByMostPlayed( CArray<Song*, Song*> &arraySongPointers );
+void SortSongPointerArrayByDifficulty( vector<Song*> &arraySongPointers );
+void SortSongPointerArrayByTitle( vector<Song*> &arraySongPointers );
+void SortSongPointerArrayByBPM( vector<Song*> &arraySongPointers );
+void SortSongPointerArrayByArtist( vector<Song*> &arraySongPointers );
+void SortSongPointerArrayByGroup( vector<Song*> &arraySongPointers );
+void SortSongPointerArrayByMostPlayed( vector<Song*> &arraySongPointers );
 
 
 

Index: SongManager.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/SongManager.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- SongManager.cpp	2 Jan 2003 22:10:48 -0000	1.79
+++ SongManager.cpp	3 Jan 2003 05:56:28 -0000	1.80
@@ -417,7 +417,7 @@
 }
 
 
-void SongManager::GetSongsInGroup( const CString sGroupName, CArray<Song*, Song*> &AddTo )
+void SongManager::GetSongsInGroup( const CString sGroupName, vector<Song*> &AddTo )
 {
 	for( unsigned i=0; i<m_pSongs.size(); i++ )
 	{
@@ -472,7 +472,7 @@
 	for( g=0; g<saGroupNames.size(); g++ )	// foreach Group
 	{
 		CString sGroupName = saGroupNames[g];
-		CArray<Song*, Song*> apGroupSongs;
+		vector<Song*> apGroupSongs;
 		GetSongsInGroup( sGroupName, apGroupSongs );
 
 		for( Difficulty dc=DIFFICULTY_EASY; dc<=DIFFICULTY_HARD; dc=Difficulty(dc+1) )	// foreach Difficulty
@@ -559,13 +559,13 @@
 	Song*	pExtra2Song = NULL;		// a medium-hard Song and Notes.  Use this for extra stage 2.
 	Notes*	pExtra2Notes = NULL;
 	
-	CArray<Song*,Song*> apSongs;
+	vector<Song*> apSongs;
 	SONGMAN->GetSongsInGroup( GAMESTATE->m_sPreferredGroup, apSongs );
 	for( unsigned s=0; s<apSongs.size(); s++ )	// foreach song
 	{
 		Song* pSong = apSongs[s];
 
-		CArray<Notes*,Notes*> apNotes;
+		vector<Notes*> apNotes;
 		pSong->GetNotesThatMatch( sd->m_NotesType, apNotes );
 		for( unsigned n=0; n<apNotes.size(); n++ )	// foreach Notes
 		{

Index: SongManager.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/SongManager.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- SongManager.h	21 Dec 2002 18:23:12 -0000	1.30
+++ SongManager.h	3 Jan 2003 05:56:28 -0000	1.31
@@ -26,7 +26,7 @@
 	SongManager( LoadingWindow *ld );
 	~SongManager();
 
-	CArray<Song*, Song*>	m_pSongs;	// all songs that can be played
+	vector<Song*>	m_pSongs;	// all songs that can be played
 
 	void InitSongArrayFromDisk( LoadingWindow *ld );
 	void FreeSongArray();
@@ -43,17 +43,17 @@
 
 	static CString ShortenGroupName( const CString &sOrigGroupName );
 
-	void GetSongsInGroup( const CString sGroupName, CArray<Song*,Song*> &AddTo );
+	void GetSongsInGroup( const CString sGroupName, vector<Song*> &AddTo );
 
 
 	// for Oni
-	CArray<Course, Course> m_aOniCourses;
+	vector<Course> m_aOniCourses;
 
 	// for Extra Stages
-	CArray<Course, Course> m_aExtraCourses;
+	vector<Course> m_aExtraCourses;
 	
 	// for Endless
-	CArray<Course, Course> m_aEndlessCourses;
+	vector<Course> m_aEndlessCourses;
 
 	void InitCoursesFromDisk();
 	void ReloadCourses();

Index: SongSelector.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/SongSelector.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SongSelector.h	11 Nov 2002 04:53:30 -0000	1.5
+++ SongSelector.h	3 Jan 2003 05:56:28 -0000	1.6
@@ -48,7 +48,7 @@
 	unsigned	m_iSelectedGroup;		// index into m_sGroups
 	BitmapText	m_textGroup;
 
-	CArray<Song*, Song*> m_pSongs;
+	vector<Song*> m_pSongs;
 	unsigned 	m_iSelectedSong;	// index into m_pSongs
 	Banner		m_Banner;
 	TextBanner  m_TextBanner;
@@ -56,11 +56,11 @@
 	Sprite		m_sprArrowLeft;
 	Sprite		m_sprArrowRight;
 
-	CArray<Style, Style> m_Styles;
+	vector<Style> m_Styles;
 	unsigned 	m_iSelectedStyle;	// index into m_Styles
 	BitmapText	m_textStyle;
 
-	CArray<Notes*, Notes*> m_pNotess;
+	vector<Notes*> m_pNotess;
 	unsigned 	m_iSelectedNotes;	// index into m_pNotess
 	BitmapText	m_textNotes;
 

Index: StdAfx.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/StdAfx.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- StdAfx.h	3 Jan 2003 04:11:37 -0000	1.30
+++ StdAfx.h	3 Jan 2003 05:56:28 -0000	1.31
@@ -103,9 +103,6 @@
 
 #endif
 
-template <class Type, class IGNOREME>
-class StdCArray: public std::vector<Type> {};
-#define CArray StdCArray
 #define CStringArray vector<CString>
 
 /* Include this here to make sure our assertion handler is always