Replace CArray. Remove templated MFC includes.

stepmania/src/StdAfx.h

@@ -18,9 +18,13 @@
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff
 
+#if defined(_MSC_VER) && (_MSC_VER > 1100)
+#pragma warning (disable : 4786) // turn off broken debugger warning
+#endif
+
 #include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxtempl.h>		// MFC templated collections
+
+#include "STDCarray.h"
 
 /* Don't include our own headers here, since they tend to change
  * often. */

stepmania/src/StepMania.dsp

@@ -59,7 +59,7 @@ IntDir=.\../Release6
 TargetDir=\temp\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc       	cl        /Zl        /nologo        /c        verstub.cpp        /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc        	cl         /Zl         /nologo         /c         verstub.cpp         /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\temp\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc       	cl        /Zl        /nologo        /c        verstub.cpp        /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc        	cl         /Zl         /nologo         /c         verstub.cpp         /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -492,6 +492,10 @@ SOURCE=.\StdAfx.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\STDCarray.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\StepMania.cpp
 # End Source File
 # Begin Source File

stepmania/src/StepMania.vcproj

@@ -564,6 +564,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="dxutil.h">
 			</File>
+			<File
+				RelativePath="mycarray.h">
+			</File>
 			<File
 				RelativePath=".\resource.h">
 			</File>