and another merge

Xcode/stepmania.xcodeproj/project.pbxproj

@@ -7352,6 +7352,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7395,6 +7396,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7438,6 +7440,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7484,6 +7487,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7527,6 +7531,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7569,6 +7574,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7611,6 +7617,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7656,6 +7663,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7698,6 +7706,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = "";
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7738,6 +7747,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = "";
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7778,6 +7788,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = "";
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7821,6 +7832,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = "";
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
@@ -7889,7 +7901,7 @@
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/../src/ffmpeg/include",
@@ -7946,7 +7958,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_STRICT_ALIASING = YES;
 				GCC_UNROLL_LOOPS = YES;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -8000,6 +8012,7 @@
 					NO_MP3_SUPPORT,
 					WITHOUT_NETWORKING,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/Frameworks/ffmpeg.framework/Headers",
@@ -8048,6 +8061,7 @@
 					NO_MP3_SUPPORT,
 					WITHOUT_NETWORKING,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/Frameworks/ffmpeg.framework/Headers",
@@ -8098,6 +8112,7 @@
 					WITHOUT_NETWORKING,
 					"$(value)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/Frameworks/ffmpeg.framework/Headers",
@@ -8141,6 +8156,7 @@
 					LUA_USE_MACOSX,
 					"$(value)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8159,6 +8175,7 @@
 					LUA_USE_MACOSX,
 					"$(value)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8177,6 +8194,7 @@
 					LUA_USE_MACOSX,
 					"$(value)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8192,6 +8210,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = LUA_USE_MACOSX;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8207,6 +8226,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = LUA_USE_MACOSX;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8222,6 +8242,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = LUA_USE_MACOSX;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8261,6 +8282,7 @@
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_MODEL_TUNING = G5;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
@@ -8276,6 +8298,7 @@
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_MODEL_TUNING = G5;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
@@ -8293,6 +8316,7 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
@@ -8310,6 +8334,7 @@
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				INSTALL_PATH = /usr/local/lib;
@@ -8327,6 +8352,7 @@
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				INSTALL_PATH = /usr/local/lib;
@@ -8344,6 +8370,7 @@
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				INSTALL_PATH = /usr/local/lib;
@@ -8374,6 +8401,7 @@
 					"SIZEOF_LONG=4",
 					"$(FPM)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -8410,6 +8438,7 @@
 					"SIZEOF_LONG=4",
 					"$(FPM)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -8446,6 +8475,7 @@
 					"SIZEOF_LONG=4",
 					"$(FPM)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -8485,6 +8515,7 @@
 					"SIZEOF_LONG=4",
 					"$(FPM)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -8523,7 +8554,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_STRICT_ALIASING = YES;
 				GCC_UNROLL_LOOPS = YES;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -8576,7 +8607,7 @@
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/../src/ffmpeg/include",
@@ -8650,6 +8681,7 @@
 					NO_MP3_SUPPORT,
 					WITHOUT_NETWORKING,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/Frameworks/ffmpeg.framework/Headers",
@@ -8695,6 +8727,7 @@
 					"$(value)",
 					LUA_USE_MACOSX,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -8718,6 +8751,7 @@
 					LUA_USE_MACOSX,
 					"$(value)",
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8733,6 +8767,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = LUA_USE_MACOSX;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = "$(HOME)/bin";
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
 				OBJROOT = "$(SRCROOT)/build";
@@ -8754,6 +8789,7 @@
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_MODEL_TUNING = G5;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
@@ -8771,6 +8807,7 @@
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
 				GCC_WARN_PROTOTYPE_CONVERSION = NO;
 				INSTALL_PATH = /usr/local/lib;
@@ -8815,7 +8852,7 @@
 				GCC_ENABLE_SSE3_EXTENSIONS = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/../src/ffmpeg/include",
@@ -8870,7 +8907,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_STRICT_ALIASING = YES;
 				GCC_UNROLL_LOOPS = YES;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -8944,7 +8981,7 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/../src/ffmpeg/include",
@@ -9000,7 +9037,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_STRICT_ALIASING = YES;
 				GCC_UNROLL_LOOPS = YES;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -9051,6 +9088,7 @@
 					"$(value)",
 					LUA_USE_MACOSX,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -9076,6 +9114,7 @@
 					"$(value)",
 					LUA_USE_MACOSX,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -9101,6 +9140,7 @@
 					"$(value)",
 					LUA_USE_MACOSX,
 				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;

src/NotesLoaderKSF.cpp

@@ -23,6 +23,11 @@ static void HandleBunki( TimingData &timing, const float fEarlyBPM,
 static bool HandlePipeChars( TimingData &timing, const RString sNoteRow, 
 			    const float fCurBeat, int &iTickCount )
 {
+	// gotta do something tricky here: if the bpm is below one then a couple of calculations
+	// for scrollsegments will be made, example, bpm 0.2, tick 4000, the scrollsegment will
+	// be 0. if the tickcount is non a stepmania standard then it will be adapted, a scroll
+	// segment will then be added based on approximations.
+
 	RString temp = sNoteRow.substr(2,sNoteRow.size()-3);
 	float numTemp = StringToFloat(temp);
 	if (BeginsWith(sNoteRow, "|T")) 
@@ -51,6 +56,27 @@ static bool HandlePipeChars( TimingData &timing, const RString sNoteRow,
 		timing.SetStopAtBeat( fCurBeat, fCurDelay, true );
 		return true;
 	}
+	else if (BeginsWith(sNoteRow, "|M") || BeginsWith(sNoteRow, "|C"))
+	{
+		// multipliers/combo
+		timing.SetComboAtBeat( fCurBeat, static_cast<int>(numTemp) );
+		return true;
+	}
+	else if (BeginsWith(sNoteRow, "|S"))
+	{
+		return false;
+	}
+	else if (BeginsWith(sNoteRow, "|F"))
+	{
+		//
+		return false;
+	}
+	
+	else if (BeginsWith(sNoteRow, "|X"))
+	{
+		timing.SetScrollAtBeat( fCurBeat, numTemp );
+		return true;
+	}
 	return false;
 }
 

src/StepMania-net2008.vcproj

@@ -460,14 +460,6 @@
 				RelativePath="Screen.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenAttract.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenAttract.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenBookkeeping.cpp"
 				>
@@ -484,38 +476,6 @@
 				RelativePath="ScreenContinue.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenDebugOverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenDebugOverlay.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenDemonstration.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenDemonstration.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEdit.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEdit.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEditMenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEditMenu.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenEnding.cpp"
 				>
@@ -540,14 +500,6 @@
 				RelativePath="ScreenExit.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenHighScores.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenHighScores.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenHowToPlay.cpp"
 				>
@@ -556,14 +508,6 @@
 				RelativePath="ScreenHowToPlay.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenInstallOverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenInstallOverlay.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenInstructions.cpp"
 				>
@@ -580,14 +524,6 @@
 				RelativePath="ScreenJukebox.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenMapControllers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenMapControllers.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenMessage.cpp"
 				>
@@ -620,46 +556,6 @@
 				RelativePath="ScreenNameEntryTraditional.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenNetEvaluation.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetEvaluation.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetRoom.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetRoom.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetSelectBase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetSelectBase.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetSelectMusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetSelectMusic.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetworkOptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenNetworkOptions.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenPackages.cpp"
 				>
@@ -676,22 +572,6 @@
 				RelativePath="ScreenPlayerOptions.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenProfileLoad.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenProfileLoad.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenProfileSave.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenProfileSave.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenPrompt.cpp"
 				>
@@ -700,14 +580,6 @@
 				RelativePath="ScreenPrompt.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenRanking.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenRanking.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenReloadSongs.cpp"
 				>
@@ -796,14 +668,6 @@
 				RelativePath="ScreenSetTime.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenSMOnlineLogin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenSMOnlineLogin.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenSongOptions.cpp"
 				>
@@ -820,22 +684,6 @@
 				RelativePath="ScreenSplash.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenStatsOverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenStatsOverlay.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenSyncOverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenSyncOverlay.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenSystemLayer.cpp"
 				>
@@ -844,38 +692,6 @@
 				RelativePath="ScreenSystemLayer.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenTestFonts.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestFonts.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestInput.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestLights.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestLights.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestSound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenTestSound.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenTextEntry.cpp"
 				>
@@ -967,6 +783,14 @@
 			<Filter
 				Name="Options"
 				>
+				<File
+					RelativePath="ScreenMapControllers.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenMapControllers.h"
+					>
+				</File>
 				<File
 					RelativePath="ScreenOptions.cpp"
 					>
@@ -1064,6 +888,206 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Network"
+				>
+				<File
+					RelativePath="ScreenNetEvaluation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetEvaluation.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetRoom.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetRoom.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetSelectBase.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetSelectBase.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetSelectMusic.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetSelectMusic.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetworkOptions.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenNetworkOptions.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenSMOnlineLogin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenSMOnlineLogin.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Edit"
+				>
+				<File
+					RelativePath="ScreenEdit.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenEdit.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenEditMenu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenEditMenu.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Overlays"
+				>
+				<File
+					RelativePath="ScreenDebugOverlay.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenDebugOverlay.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenInstallOverlay.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenInstallOverlay.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenStatsOverlay.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenStatsOverlay.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenSyncOverlay.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenSyncOverlay.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Attract"
+				>
+				<File
+					RelativePath="ScreenAttract.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenAttract.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenDemonstration.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenDemonstration.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenHighScores.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenHighScores.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenRanking.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenRanking.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Profile"
+				>
+				<File
+					RelativePath="ScreenProfileLoad.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenProfileLoad.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenProfileSave.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenProfileSave.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Test"
+				>
+				<File
+					RelativePath="ScreenTestFonts.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestFonts.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestInput.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestInput.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestLights.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestLights.h"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestSound.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ScreenTestSound.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Data Structures"
@@ -1524,8 +1548,14 @@
 				RelativePath="TimingData.h"
 				>
 			</File>
-			<File RelativePath="TimingSegments.cpp"></File>
+			<File
-			<File RelativePath="TimingSegments.h"></File>
+				RelativePath="TimingSegments.cpp"
+				>
+			</File>
+			<File
+				RelativePath="TimingSegments.h"
+				>
+			</File>
 			<File
 				RelativePath="TitleSubstitution.cpp"
 				>
@@ -2810,8 +2840,14 @@
 				RelativePath="HelpDisplay.h"
 				>
 			</File>
-			<File RelativePath="InGameLoadingWindow.cpp"></File>
+			<File
-			<File RelativePath="InGameLoadingWindow.h"></File>
+				RelativePath="InGameLoadingWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath="InGameLoadingWindow.h"
+				>
+			</File>
 			<File
 				RelativePath="MemoryCardDisplay.cpp"
 				>