Mac OS X: Added unit cthreads. USDX now runs on OS X! But you can't do anything :-) Fonts are not working, but you can quit the program cleanly by pressing ESC and ENTER (MainLoop works).

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@565 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 244 insertions, 209 deletions

diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
index b8f1379d..3dd9e158 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
@@ -190,6 +190,46 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
+				<string>2C0C2C180CDC7312004A651F</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>USongs.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C0C2C190CDC7312004A651F</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>USongs.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CD3B28C0CDC76B6001F1030</string>
+						<key>history</key>
+						<array>
+							<string>2CD3B2550CDC7564001F1030</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {797, 748}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>84 171 797 789 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
 				<string>2CF552990CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>UMain.pas</string>
@@ -204,10 +244,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2BB0CDBB0F2002CC3B0</string>
+						<string>2CD3B28D0CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2C4FA2B10CDBB0CF002CC3B0</string>
+							<string>2C0C2C430CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -244,10 +284,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2BC0CDBB0F2002CC3B0</string>
+						<string>2CD3B28E0CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71AC0CDBA6300018F966</string>
+							<string>2C0C2C450CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -284,10 +324,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2BD0CDBB0F2002CC3B0</string>
+						<string>2CD3B28F0CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71AE0CDBA6300018F966</string>
+							<string>2C0C2C460CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -324,10 +364,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2BE0CDBB0F2002CC3B0</string>
+						<string>2CD3B2900CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71AF0CDBA6300018F966</string>
+							<string>2C0C2C470CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -364,10 +404,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2BF0CDBB0F2002CC3B0</string>
+						<string>2CD3B2910CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71B00CDBA6300018F966</string>
+							<string>2C0C2C480CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -404,10 +444,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2C00CDBB0F2002CC3B0</string>
+						<string>2CD3B2920CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71B10CDBA6300018F966</string>
+							<string>2C0C2C490CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -444,10 +484,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2C10CDBB0F2002CC3B0</string>
+						<string>2CD3B2930CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71B20CDBA6300018F966</string>
+							<string>2C0C2C4A0CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -484,10 +524,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C4FA2C20CDBB0F2002CC3B0</string>
+						<string>2CD3B2940CDC76B6001F1030</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71B30CDBA6300018F966</string>
+							<string>2C0C2C4B0CDC73BE004A651F</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -691,9 +731,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2C4FA2940CDBAB21002CC3B0</string>
+				<string>2CD3B23F0CDC7545001F1030</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2C4FA2950CDBAB21002CC3B0</string>
+				<string>2CD3B2400CDC7545001F1030</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -827,8 +867,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>2CD3B2610CDC7564001F1030</string>
+		<string>2CD3B2620CDC7564001F1030</string>
+		<string>2CDD4BFC0CB948FC00549FAC</string>
 		<string>2CDD4B730CB935C700549FAC</string>
-		<string>2C4FA2A50CDBAB21002CC3B0</string>
+		<string>2CD3B2500CDC7545001F1030</string>
 		<string>2CF5528D0CDA426600627463</string>
 		<string>2CF553750CDA575B00627463</string>
 		<string>2CF553720CDA575B00627463</string>
@@ -836,9 +879,11 @@
 		<string>2CF552930CDA426600627463</string>
 		<string>2CF552960CDA426600627463</string>
 		<string>2CF5536C0CDA575B00627463</string>
-		<string>1CD10A99069EF8BA00B06720</string>
 		<string>2CF552990CDA426600627463</string>
+		<string>1C0AD2B3069F1EA900FABCE6</string>
 		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
+		<string>2C0C2C180CDC7312004A651F</string>
+		<string>1CD10A99069EF8BA00B06720</string>
 	</array>
 	<key>WindowString</key>
 	<string>772 270 817 753 0 0 1680 1028 </string>
@@ -869,14 +914,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1318, 344}}</string>
+								<string>{{0, 0}, {1346, 566}}</string>
 								<key>RubberWindowFrame</key>
-								<string>312 244 1318 626 0 0 1680 1028 </string>
+								<string>106 169 1346 848 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>344pt</string>
+							<string>566pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -893,9 +938,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 349}, {1318, 236}}</string>
+								<string>{{0, 571}, {1346, 236}}</string>
 								<key>RubberWindowFrame</key>
-								<string>312 244 1318 626 0 0 1680 1028 </string>
+								<string>106 169 1346 848 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
@@ -904,7 +949,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>585pt</string>
+					<string>807pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -918,14 +963,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2CDD4B730CB935C700549FAC</string>
-				<string>2C4FA2BA0CDBB0CF002CC3B0</string>
+				<string>2CD3B25F0CDC7564001F1030</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.build</string>
 			<key>WindowString</key>
-			<string>312 244 1318 626 0 0 1680 1028 </string>
+			<string>106 169 1346 848 0 0 1680 1028 </string>
 			<key>WindowToolGUID</key>
 			<string>2CDD4B730CB935C700549FAC</string>
 			<key>WindowToolIsVisible</key>
@@ -960,8 +1005,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {354, 414}}</string>
-											<string>{{354, 0}, {610, 414}}</string>
+											<string>{{0, 0}, {347, 414}}</string>
+											<string>{{347, 0}, {617, 414}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -1024,14 +1069,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2C4FA29F0CDBAB21002CC3B0</string>
+				<string>2CD3B24A0CDC7545001F1030</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2C4FA2A00CDBAB21002CC3B0</string>
-				<string>2C4FA2A10CDBAB21002CC3B0</string>
-				<string>2C4FA2A20CDBAB21002CC3B0</string>
-				<string>2C4FA2A30CDBAB21002CC3B0</string>
-				<string>2C4FA2A40CDBAB21002CC3B0</string>
-				<string>2C4FA2A50CDBAB21002CC3B0</string>
+				<string>2CD3B24B0CDC7545001F1030</string>
+				<string>2CD3B24C0CDC7545001F1030</string>
+				<string>2CD3B24D0CDC7545001F1030</string>
+				<string>2CD3B24E0CDC7545001F1030</string>
+				<string>2CD3B24F0CDC7545001F1030</string>
+				<string>2CD3B2500CDC7545001F1030</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debug</string>
@@ -1185,7 +1230,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2CDD4BFC0CB948FC00549FAC</string>
-				<string>2CDC71900CDB9D2D0018F966</string>
+				<string>2CD3B2600CDC7564001F1030</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>WindowString</key>
@@ -1280,9 +1325,9 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>2C6FEC9A0CC8021800D0C913</string>
+				<string>2CD3B2510CDC7545001F1030</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>2C6FEC9B0CC8021800D0C913</string>
+				<string>2CD3B2520CDC7545001F1030</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
@@ -1291,7 +1336,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C0AD2B3069F1EA900FABCE6</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index 3bb5dffc..af8b639d 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -1,5 +1,85 @@
 // !$*UTF8*$!
 {
+	2C0C2C430CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 15";
+		rLen = 0;
+		rLoc = 198;
+		rType = 0;
+		vrLen = 637;
+		vrLoc = 0;
+	};
+	2C0C2C450CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		name = "UltraStarDX.pas: 6";
+		rLen = 0;
+		rLoc = 117;
+		rType = 0;
+		vrLen = 131;
+		vrLoc = 0;
+	};
+	2C0C2C460CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
+		name = "UAudio_FFMpeg.pas: 952";
+		rLen = 0;
+		rLoc = 22697;
+		rType = 0;
+		vrLen = 1224;
+		vrLoc = 21473;
+	};
+	2C0C2C470CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
+		name = "nux ... is t";
+		rLen = 12;
+		rLoc = 3202;
+		rType = 0;
+		vrLen = 1266;
+		vrLoc = 15619;
+	};
+	2C0C2C480CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
+		name = "sdl_image.pas: 130";
+		rLen = 0;
+		rLoc = 8020;
+		rType = 0;
+		vrLen = 832;
+		vrLoc = 7978;
+	};
+	2C0C2C490CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
+		name = "sdl.pas: 250";
+		rLen = 0;
+		rLoc = 16506;
+		rType = 0;
+		vrLen = 886;
+		vrLoc = 16376;
+	};
+	2C0C2C4A0CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
+		name = "ScaledTexture(TexSur";
+		rLen = 20;
+		rLoc = 11816;
+		rType = 0;
+		vrLen = 1220;
+		vrLoc = 11189;
+	};
+	2C0C2C4B0CDC73BE004A651F /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
+		name = "Windows.pas: 114";
+		rLen = 0;
+		rLoc = 2832;
+		rType = 0;
+		vrLen = 1182;
+		vrLoc = 2090;
+	};
 	2C4D9C620CC9EC8C0031092D /* TextGL.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {758, 7742}}";
@@ -26,9 +106,9 @@
 	};
 	2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {764, 2128}}";
-			sepNavSelRange = "{352, 0}";
-			sepNavVisRect = "{{0, 0}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {923, 2128}}";
+			sepNavSelRange = "{1154, 0}";
+			sepNavVisRect = "{{0, 354}, {923, 342}}";
 			sepNavWindowFrame = "{{61, 136}, {797, 845}}";
 		};
 	};
@@ -50,9 +130,9 @@
 	};
 	2C4D9C680CC9EC8C0031092D /* UCore.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1136, 6888}}";
-			sepNavSelRange = "{13272, 0}";
-			sepNavVisRect = "{{0, 6145}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1305, 7028}}";
+			sepNavSelRange = "{12989, 64}";
+			sepNavVisRect = "{{0, 6320}, {1305, 534}}";
 			sepNavWindowFrame = "{{107, 94}, {797, 845}}";
 		};
 	};
@@ -74,9 +154,9 @@
 	};
 	2C4D9C6B0CC9EC8C0031092D /* UDataBase.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {4058, 5026}}";
-			sepNavSelRange = "{60, 19}";
-			sepNavVisRect = "{{0, 0}, {1277, 312}}";
+			sepNavIntBoundsRect = "{{0, 0}, {4058, 5082}}";
+			sepNavSelRange = "{1600, 0}";
+			sepNavVisRect = "{{0, 1250}, {923, 342}}";
 			sepNavWindowFrame = "{{153, 52}, {797, 845}}";
 		};
 	};
@@ -106,9 +186,9 @@
 	};
 	2C4D9C6F0CC9EC8C0031092D /* UGraphic.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {830, 9800}}";
-			sepNavSelRange = "{872, 16}";
-			sepNavVisRect = "{{0, 391}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {923, 10444}}";
+			sepNavSelRange = "{15582, 0}";
+			sepNavVisRect = "{{0, 6612}, {923, 342}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
 	};
@@ -146,9 +226,9 @@
 	};
 	2C4D9C740CC9EC8C0031092D /* ULanguage.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {758, 3290}}";
-			sepNavSelRange = "{46, 0}";
-			sepNavVisRect = "{{0, 0}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {923, 3346}}";
+			sepNavSelRange = "{1257, 0}";
+			sepNavVisRect = "{{0, 914}, {923, 342}}";
 			sepNavWindowFrame = "{{153, 52}, {797, 845}}";
 		};
 	};
@@ -194,9 +274,9 @@
 	};
 	2C4D9C7B0CC9EC8C0031092D /* UMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1013, 15078}}";
-			sepNavSelRange = "{3441, 0}";
-			sepNavVisRect = "{{0, 1682}, {1013, 614}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1013, 15456}}";
+			sepNavSelRange = "{198, 0}";
+			sepNavVisRect = "{{0, 0}, {1013, 614}}";
 			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
 		};
 	};
@@ -298,9 +378,9 @@
 	};
 	2C4D9C890CC9EC8C0031092D /* USongs.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 14616}}";
-			sepNavSelRange = "{7664, 0}";
-			sepNavVisRect = "{{0, 3738}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {950, 14686}}";
+			sepNavSelRange = "{503, 0}";
+			sepNavVisRect = "{{0, 2095}, {758, 716}}";
 			sepNavWindowFrame = "{{84, 115}, {797, 845}}";
 		};
 	};
@@ -314,9 +394,9 @@
 	};
 	2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1730, 16016}}";
-			sepNavSelRange = "{11823, 20}";
-			sepNavVisRect = "{{0, 5156}, {577, 612}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1730, 15960}}";
+			sepNavSelRange = "{11816, 20}";
+			sepNavVisRect = "{{0, 4988}, {577, 612}}";
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
@@ -503,27 +583,37 @@
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
-	2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2550CDC7564001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 148";
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		name = "USongs.pas: 39";
 		rLen = 0;
-		rLoc = 3441;
+		rLoc = 503;
 		rType = 0;
-		vrLen = 1295;
-		vrLoc = 2495;
+		vrLen = 753;
+		vrLoc = 0;
 	};
-	2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B28C0CDC76B6001F1030 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		name = "USongs.pas: 39";
+		rLen = 0;
+		rLoc = 503;
+		rType = 0;
+		vrLen = 1403;
+		vrLoc = 4615;
+	};
+	2CD3B28D0CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 148";
+		name = "UMain.pas: 15";
 		rLen = 0;
-		rLoc = 3441;
+		rLoc = 198;
 		rType = 0;
-		vrLen = 1295;
-		vrLoc = 2495;
+		vrLen = 637;
+		vrLoc = 0;
 	};
-	2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B28E0CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
 		name = "UltraStarDX.pas: 6";
@@ -533,7 +623,7 @@
 		vrLen = 131;
 		vrLoc = 0;
 	};
-	2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B28F0CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
 		name = "UAudio_FFMpeg.pas: 952";
@@ -543,7 +633,7 @@
 		vrLen = 1224;
 		vrLoc = 21473;
 	};
-	2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2900CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
 		name = "nux ... is t";
@@ -553,7 +643,7 @@
 		vrLen = 1266;
 		vrLoc = 15619;
 	};
-	2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2910CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
 		name = "sdl_image.pas: 130";
@@ -563,7 +653,7 @@
 		vrLen = 832;
 		vrLoc = 7978;
 	};
-	2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2920CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
 		name = "sdl.pas: 250";
@@ -573,17 +663,17 @@
 		vrLen = 886;
 		vrLoc = 16376;
 	};
-	2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2930CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = "TempSurface:=TexSur";
+		name = "ScaledTexture(TexSur";
 		rLen = 20;
-		rLoc = 11823;
+		rLoc = 11816;
 		rType = 0;
 		vrLen = 1220;
-		vrLoc = 11066;
+		vrLoc = 11189;
 	};
-	2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+	2CD3B2940CDC76B6001F1030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
 		name = "Windows.pas: 114";
@@ -601,90 +691,6 @@
 			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
 		};
 	};
-	2CDC71950CDB9D430018F966 /* UMain.pas:156 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		delayBeforeContinue = 0;
-		fileReference = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		hitCount = 1;
-		lineNumber = 156;
-		location = UltraStarDX;
-		modificationTime = 215719249.543694;
-		state = 1;
-	};
-	2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
-		name = "UltraStarDX.pas: 6";
-		rLen = 0;
-		rLoc = 117;
-		rType = 0;
-		vrLen = 131;
-		vrLoc = 0;
-	};
-	2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
-		name = "UAudio_FFMpeg.pas: 952";
-		rLen = 0;
-		rLoc = 22697;
-		rType = 0;
-		vrLen = 1224;
-		vrLoc = 21473;
-	};
-	2CDC71AF0CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
-		name = "nux ... is t";
-		rLen = 12;
-		rLoc = 3202;
-		rType = 0;
-		vrLen = 1266;
-		vrLoc = 15619;
-	};
-	2CDC71B00CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
-		name = "sdl_image.pas: 130";
-		rLen = 0;
-		rLoc = 8020;
-		rType = 0;
-		vrLen = 832;
-		vrLoc = 7978;
-	};
-	2CDC71B10CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
-		name = "sdl.pas: 250";
-		rLen = 0;
-		rLoc = 16506;
-		rType = 0;
-		vrLen = 886;
-		vrLoc = 16376;
-	};
-	2CDC71B20CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = "TempSurface:=TexSur";
-		rLen = 20;
-		rLoc = 11823;
-		rType = 0;
-		vrLen = 1220;
-		vrLoc = 11066;
-	};
-	2CDC71B30CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
-		name = "Windows.pas: 114";
-		rLen = 0;
-		rLoc = 2832;
-		rType = 0;
-		vrLen = 1182;
-		vrLoc = 2090;
-	};
 	2CDD439C0CBBE92D00F364DE /* UMain.pas */ = {
 		isa = PBXFileReference;
 		fileEncoding = 30;
@@ -738,8 +744,6 @@
 		name = "Project Breakpoints";
 		objects = (
 			2CDEA8080CBD7D920096994C /* UMain.pas:293 */,
-			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */,
-			2CDC71950CDB9D430018F966 /* UMain.pas:156 */,
 		);
 	};
 	2CDEA8080CBD7D920096994C /* UMain.pas:293 */ = {
@@ -753,7 +757,7 @@
 		hitCount = 1;
 		lineNumber = 293;
 		location = UltraStarDX;
-		modificationTime = 215719244.976517;
+		modificationTime = 215774704.034014;
 		state = 1;
 	};
 	2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */ = {
@@ -1116,20 +1120,6 @@
 			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
 		};
 	};
-	2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		delayBeforeContinue = 0;
-		fileReference = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
-		hitCount = 1;
-		lineNumber = 6;
-		location = UltraStarDX;
-		modificationTime = 215719246.5172511;
-		state = 1;
-	};
 	9845B6590B1F9B9E0084DD62 /* SDL.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {948, 1330}}";
@@ -1149,8 +1139,8 @@
 	98B8BE750B1F97F800162019 /* SDLMain.m */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {948, 5390}}";
-			sepNavSelRange = "{558, 0}";
-			sepNavVisRect = "{{0, 21}, {948, 730}}";
+			sepNavSelRange = "{6150, 21}";
+			sepNavVisRect = "{{0, 2650}, {948, 730}}";
 			sepNavWindowFrame = "{{15, 164}, {987, 859}}";
 		};
 	};
@@ -1166,8 +1156,6 @@
 		);
 		breakpoints = (
 			2CDEA8080CBD7D920096994C /* UMain.pas:293 */,
-			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */,
-			2CDC71950CDB9D430018F966 /* UMain.pas:156 */,
 		);
 		breakpointsGroup = 2CDD4B7F0CB9394600549FAC /* XCBreakpointsBucket */;
 		codeSenseManager = 2CDD4B6A0CB9357000549FAC /* Code sense */;
@@ -1273,26 +1261,28 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 215722768;
-			PBXWorkspaceStateSaveDate = 215722768;
+			PBXPerProjectTemplateStateSaveDate = 215774521;
+			PBXWorkspaceStateSaveDate = 215774521;
 		};
 		perUserProjectItems = {
-			2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */ = 2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */;
-			2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */;
-			2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71AF0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AF0CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71B00CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B00CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71B10CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B10CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71B20CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B20CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71B30CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B30CDBA6300018F966 /* PBXTextBookmark */;
+			2C0C2C430CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C430CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C450CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C450CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C460CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C460CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C470CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C470CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C480CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C480CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C490CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C490CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C4A0CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C4A0CDC73BE004A651F /* PBXTextBookmark */;
+			2C0C2C4B0CDC73BE004A651F /* PBXTextBookmark */ = 2C0C2C4B0CDC73BE004A651F /* PBXTextBookmark */;
+			2CD3B2550CDC7564001F1030 /* PBXTextBookmark */ = 2CD3B2550CDC7564001F1030 /* PBXTextBookmark */;
+			2CD3B28C0CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B28C0CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B28D0CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B28D0CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B28E0CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B28E0CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B28F0CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B28F0CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B2900CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B2900CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B2910CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B2910CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B2920CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B2920CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B2930CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B2930CDC76B6001F1030 /* PBXTextBookmark */;
+			2CD3B2940CDC76B6001F1030 /* PBXTextBookmark */ = 2CD3B2940CDC76B6001F1030 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */;
 		userBuildSettings = {