Fixed MacOSX version. Can we use baseunix on linux? We could drop oldlinux then (not available on the mac).

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

6 files changed, 368 insertions, 326 deletions

diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index fa4c45b5..e4acf4aa 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -145,7 +145,6 @@ uses USongs, UJoystick, math, UCommandLine, ULanguage, SDL_ttf,
 const
   Version = 'UltraStar Deluxe V 1.10 Alpha Build';
 
-//{$IFDEF WIN32}
 Procedure Main;
 var
   WndTitle: string;
diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index 2eeeec87..7fd58034 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -9,19 +9,17 @@ interface
 {$I switches.inc}
 
 uses
-     {$ifndef MSWINDOWS}
-       {$IFDEF DARWIN}
-         baseunix,
-       {$ELSE}
+     {$IFDEF MSWINDOWS}
+       Windows,
+       DirWatch,
+     {$ELSE}
+       {$IFNDEF DARWIN}
          oldlinux,
+         syscall,
        {$ENDIF}
       baseunix,
       UnixType,
-      syscall,
-     {$else}
-       windows,
-       DirWatch,
-     {$endif}
+     {$ENDIF}
      SysUtils,
      Classes,
      ULog,
@@ -91,7 +89,7 @@ type
     fWatch    : longint;
     fParseSongDirectory : boolean;
     fProcessing         : boolean;
-    {$ifdef win32}
+    {$ifdef MSWINDOWS}
       fDirWatch           : TDirectoryWatch;
     {$endif}
     procedure int_LoadSongList;
@@ -169,7 +167,7 @@ begin
   inherited create( false );
   self.freeonterminate := true;
 
-  {$IFDEF Win32}
+  {$IFDEF MSWINDOWS}
     fDirWatch := TDirectoryWatch.create(nil);
     fDirWatch.OnChange     := DoDirChanged;
     fDirWatch.Directory    := SongPath;
@@ -206,7 +204,7 @@ end;
 
 procedure TSongs.DoDirChanged(Sender: TObject);
 begin
-  LoadSongList();

+  LoadSongList();
 end;
 
 procedure TSongs.Execute();
@@ -284,12 +282,22 @@ var
 
   {$ifdef MSWINDOWS}
     SR:     TSearchRecW;   // for parsing Songs Directory
-  {$else}  // This should work on all posix systems.
+  {$ENDIF}	
+  
+  // eddie: can we merge that? is baseunix working on linux? oldlinux is
+  //        not available on mac os x.
+  {$IFDEF LINUX}
     TheDir  : oldlinux.pdir;
     ADirent : oldlinux.pDirent;
     Entry   : Longint;
     info    : oldlinux.stat;
-  {$endif}  
+  {$ENDIF}  
+  {$IFDEF DARWIN}
+    TheDir  : pdir;
+    ADirent : pDirent;
+    Entry   : Longint;
+    info    : stat;
+  {$ENDIF}  
 begin
   {$ifdef MSWINDOWS}
     if FindFirstW(Dir + '*', faDirectory, SR) = 0 then   // JB_Unicode - windows
diff --git a/Game/Code/MacOSX/UltraStarDX.pas b/Game/Code/MacOSX/UltraStarDX.pas
index b531244f..6c5d4e2b 100644
--- a/Game/Code/MacOSX/UltraStarDX.pas
+++ b/Game/Code/MacOSX/UltraStarDX.pas
@@ -2,10 +2,7 @@ program UltraStarDX;
 
 uses UMain, UAudio_bass, UAudio_FFMpeg, UMedia_dummy, USingNotes, UTextClasses, UVideo;
 
-var i : Integer;
-
 begin
-  i := 0;
   Main;
 end.
 
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
index 4350b967..12cc23e0 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
@@ -190,24 +190,24 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF552990CDA426600627463</string>
+				<string>2CDC71470CDB9AAB0018F966</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>UMain.pas</string>
+				<string>USongs.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF5529A0CDA426600627463</string>
+						<string>2CDC71480CDB9AAB0018F966</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>UMain.pas</string>
+						<string>USongs.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553BB0CDA5A4D00627463</string>
+						<string>2CDC71AB0CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553B10CDA5A2F00627463</string>
+							<string>2CDC71650CDB9BCE0018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -219,35 +219,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {1052, 646}}</string>
+				<string>{{0, 20}, {797, 748}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>222 147 1052 687 0 0 1680 1028 </string>
+				<string>84 171 797 789 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF552960CDA426600627463</string>
+				<string>2CF5536C0CDA575B00627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>UAudio_FFMpeg.pas</string>
+				<string>UltraStarDX.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF552970CDA426600627463</string>
+						<string>2CF5536D0CDA575B00627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>UAudio_FFMpeg.pas</string>
+						<string>UltraStarDX.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553BC0CDA5A4D00627463</string>
+						<string>2CDC71AC0CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553940CDA58E900627463</string>
+							<string>2CDC717C0CDB9D150018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -259,35 +259,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {797, 748}}</string>
+				<string>{{0, 20}, {987, 762}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>38 213 797 789 0 0 1680 1028 </string>
+				<string>189 142 987 803 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF552930CDA426600627463</string>
+				<string>2CF552990CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>UAudio_bass.pas</string>
+				<string>UMain.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF552940CDA426600627463</string>
+						<string>2CF5529A0CDA426600627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>UAudio_bass.pas</string>
+						<string>UMain.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553BD0CDA5A4D00627463</string>
+						<string>2CDC71AD0CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553960CDA58E900627463</string>
+							<string>2CDE61980CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -299,35 +299,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {797, 748}}</string>
+				<string>{{0, 20}, {1052, 646}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>15 234 797 789 0 0 1680 1028 </string>
+				<string>222 147 1052 687 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF5536C0CDA575B00627463</string>
+				<string>2CF552960CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>UltraStarDX.pas</string>
+				<string>UAudio_FFMpeg.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF5536D0CDA575B00627463</string>
+						<string>2CF552970CDA426600627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>UltraStarDX.pas</string>
+						<string>UAudio_FFMpeg.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553BE0CDA5A4D00627463</string>
+						<string>2CDC71AE0CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553670CDA575100627463</string>
+							<string>2CDE61990CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -339,35 +339,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {987, 762}}</string>
+				<string>{{0, 20}, {797, 748}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>189 142 987 803 0 0 1680 1028 </string>
+				<string>38 213 797 789 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF5536F0CDA575B00627463</string>
+				<string>2CF552930CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>sdl_image.pas</string>
+				<string>UAudio_bass.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF553700CDA575B00627463</string>
+						<string>2CF552940CDA426600627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>sdl_image.pas</string>
+						<string>UAudio_bass.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553BF0CDA5A4D00627463</string>
+						<string>2CDC71AF0CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553060CDA514A00627463</string>
+							<string>2CDE619A0CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -379,35 +379,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {1052, 646}}</string>
+				<string>{{0, 20}, {797, 748}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>15 336 1052 687 0 0 1680 1028 </string>
+				<string>15 234 797 789 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF553720CDA575B00627463</string>
+				<string>2CF5536F0CDA575B00627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>sdl.pas</string>
+				<string>sdl_image.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF553730CDA575B00627463</string>
+						<string>2CF553700CDA575B00627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>sdl.pas</string>
+						<string>sdl_image.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553C00CDA5A4D00627463</string>
+						<string>2CDC71B00CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553040CDA513000627463</string>
+							<string>2CDE619C0CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -419,35 +419,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {987, 762}}</string>
+				<string>{{0, 20}, {1052, 646}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>211 199 987 803 0 0 1680 1028 </string>
+				<string>15 336 1052 687 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF553750CDA575B00627463</string>
+				<string>2CF553720CDA575B00627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>UTexture.pas</string>
+				<string>sdl.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF553760CDA575B00627463</string>
+						<string>2CF553730CDA575B00627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>UTexture.pas</string>
+						<string>sdl.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553C10CDA5A4D00627463</string>
+						<string>2CDC71B10CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF552FF0CDA500800627463</string>
+							<string>2CDE619D0CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -459,35 +459,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {616, 644}}</string>
+				<string>{{0, 20}, {987, 762}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>15 338 616 685 0 0 1680 1028 </string>
+				<string>211 199 987 803 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF5528D0CDA426600627463</string>
+				<string>2CF553750CDA575B00627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>Windows.pas</string>
+				<string>UTexture.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF5528E0CDA426600627463</string>
+						<string>2CF553760CDA575B00627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>Windows.pas</string>
+						<string>UTexture.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553C20CDA5A4D00627463</string>
+						<string>2CDC71B20CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF553780CDA575B00627463</string>
+							<string>2CDE619E0CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -503,31 +503,31 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>176 191 616 685 0 0 1680 1028 </string>
+				<string>15 338 616 685 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF5528A0CDA426600627463</string>
+				<string>2CF5528D0CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>Messages.pas</string>
+				<string>Windows.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CF5528B0CDA426600627463</string>
+						<string>2CF5528E0CDA426600627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>Messages.pas</string>
+						<string>Windows.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CF553C30CDA5A4D00627463</string>
+						<string>2CDC71B30CDBA6300018F966</string>
 						<key>history</key>
 						<array>
-							<string>2CF552760CDA419B00627463</string>
+							<string>2CDE619F0CDB99D400E8B3D1</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -539,11 +539,11 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {1052, 646}}</string>
+				<string>{{0, 20}, {616, 644}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>102 232 1052 687 0 0 1680 1028 </string>
+				<string>176 191 616 685 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 	</array>
@@ -617,19 +617,18 @@
 							<array>
 								<string>DDC6850D09F5717A004E4BFF</string>
 								<string>DD7C45450A6E72DE003FA52B</string>
+								<string>2CF5510C0CDA28F000627463</string>
 								<string>DDC6868A09F571C2004E4BFF</string>
 								<string>2CDD8D0B0CC5539900E4169D</string>
 								<string>DDC6888C09F57243004E4BFF</string>
 								<string>DDC688C809F574E9004E4BFF</string>
 								<string>1C37FBAC04509CD000000102</string>
-								<string>2CF5536A0CDA575B00627463</string>
-								<string>2CF5536B0CDA575B00627463</string>
 								<string>1C37FAAC04509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>17</integer>
+									<integer>25</integer>
 									<integer>15</integer>
 									<integer>0</integer>
 								</array>
@@ -654,7 +653,7 @@
 							<real>266</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>775 270 817 753 0 0 1680 1028 </string>
+						<string>773 270 817 753 0 0 1680 1028 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -691,7 +690,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {529, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>775 270 817 753 0 0 1680 1028 </string>
+								<string>773 270 817 753 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -713,7 +712,7 @@
 								<key>Frame</key>
 								<string>{{0, 5}, {529, 707}}</string>
 								<key>RubberWindowFrame</key>
-								<string>775 270 817 753 0 0 1680 1028 </string>
+								<string>773 270 817 753 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -737,9 +736,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2CF5501B0CDA1CD700627463</string>
+				<string>2CDC71380CDB9A4A0018F966</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2CF5501C0CDA1CD700627463</string>
+				<string>2CDC71390CDB9A4A0018F966</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -873,26 +872,25 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>2CF5537F0CDA575B00627463</string>
-		<string>2CF553800CDA575B00627463</string>
+		<string>2CDC71910CDB9D2D0018F966</string>
+		<string>2CDC71920CDB9D2D0018F966</string>
 		<string>2CDD4BFC0CB948FC00549FAC</string>
-		<string>2CF54F210CDA14A100627463</string>
-		<string>2CF5528A0CDA426600627463</string>
+		<string>2CDC718F0CDB9D2D0018F966</string>
 		<string>2CF5528D0CDA426600627463</string>
-		<string>1C530D57069F1CE1000CFCEE</string>
 		<string>2CF553750CDA575B00627463</string>
 		<string>2CF553720CDA575B00627463</string>
 		<string>2CF5536F0CDA575B00627463</string>
-		<string>2CDD4B730CB935C700549FAC</string>
-		<string>2CF5536C0CDA575B00627463</string>
 		<string>2CF552930CDA426600627463</string>
 		<string>2CF552960CDA426600627463</string>
-		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
 		<string>2CF552990CDA426600627463</string>
+		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
+		<string>2CDD4B730CB935C700549FAC</string>
+		<string>2CF5536C0CDA575B00627463</string>
 		<string>1CD10A99069EF8BA00B06720</string>
+		<string>2CDC71470CDB9AAB0018F966</string>
 	</array>
 	<key>WindowString</key>
-	<string>775 270 817 753 0 0 1680 1028 </string>
+	<string>773 270 817 753 0 0 1680 1028 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
@@ -913,7 +911,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>UAudio_FFMpeg.pas</string>
+								<string>UltraStarDX.pas</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -971,7 +969,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2CDD4B730CB935C700549FAC</string>
-				<string>2CF54F1A0CDA14A100627463</string>
+				<string>2CDC71520CDB9AAB0018F966</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -1013,8 +1011,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {360, 414}}</string>
-											<string>{{360, 0}, {604, 414}}</string>
+											<string>{{0, 0}, {356, 414}}</string>
+											<string>{{356, 0}, {608, 414}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -1077,14 +1075,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2CF54F1B0CDA14A100627463</string>
+				<string>2CDC71890CDB9D2D0018F966</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2CF54F1C0CDA14A100627463</string>
-				<string>2CF54F1D0CDA14A100627463</string>
-				<string>2CF54F1E0CDA14A100627463</string>
-				<string>2CF54F1F0CDA14A100627463</string>
-				<string>2CF54F200CDA14A100627463</string>
-				<string>2CF54F210CDA14A100627463</string>
+				<string>2CDC718A0CDB9D2D0018F966</string>
+				<string>2CDC718B0CDB9D2D0018F966</string>
+				<string>2CDC718C0CDB9D2D0018F966</string>
+				<string>2CDC718D0CDB9D2D0018F966</string>
+				<string>2CDC718E0CDB9D2D0018F966</string>
+				<string>2CDC718F0CDB9D2D0018F966</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debug</string>
@@ -1238,7 +1236,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2CDD4BFC0CB948FC00549FAC</string>
-				<string>2CF5537E0CDA575B00627463</string>
+				<string>2CDC71900CDB9D2D0018F966</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>WindowString</key>
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index 04871a3e..545200c9 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -10,17 +10,17 @@
 	};
 	2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {884, 9044}}";
+			sepNavIntBoundsRect = "{{0, 0}, {884, 9100}}";
 			sepNavSelRange = "{3202, 12}";
-			sepNavVisRect = "{{0, 8328}, {758, 716}}";
+			sepNavVisRect = "{{0, 8330}, {758, 716}}";
 			sepNavWindowFrame = "{{15, 178}, {797, 845}}";
 		};
 	};
 	2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1196, 13216}}";
-			sepNavSelRange = "{22728, 0}";
-			sepNavVisRect = "{{0, 12500}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1184, 13328}}";
+			sepNavSelRange = "{22697, 0}";
+			sepNavVisRect = "{{0, 12598}, {758, 716}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
 	};
@@ -194,9 +194,9 @@
 	};
 	2C4D9C7B0CC9EC8C0031092D /* UMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1013, 15092}}";
-			sepNavSelRange = "{3295, 0}";
-			sepNavVisRect = "{{0, 1684}, {1013, 614}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1013, 15078}}";
+			sepNavSelRange = "{3441, 0}";
+			sepNavVisRect = "{{0, 1680}, {1013, 614}}";
 			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
 		};
 	};
@@ -298,9 +298,9 @@
 	};
 	2C4D9C890CC9EC8C0031092D /* USongs.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 12544}}";
-			sepNavSelRange = "{7215, 0}";
-			sepNavVisRect = "{{0, 3298}, {758, 716}}";
+			sepNavIntBoundsRect = "{{0, 0}, {950, 14616}}";
+			sepNavSelRange = "{7664, 0}";
+			sepNavVisRect = "{{0, 3743}, {758, 716}}";
 			sepNavWindowFrame = "{{84, 115}, {797, 845}}";
 		};
 	};
@@ -314,9 +314,9 @@
 	};
 	2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1730, 15960}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1730, 16016}}";
 			sepNavSelRange = "{11823, 20}";
-			sepNavVisRect = "{{0, 5091}, {577, 612}}";
+			sepNavVisRect = "{{0, 5156}, {577, 612}}";
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
@@ -452,7 +452,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1268, 4788}}";
 			sepNavSelRange = "{8020, 0}";
-			sepNavVisRect = "{{0, 1745}, {1013, 614}}";
+			sepNavVisRect = "{{0, 1736}, {1013, 614}}";
 			sepNavWindowFrame = "{{15, 280}, {1052, 743}}";
 		};
 	};
@@ -491,7 +491,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {577, 2352}}";
 			sepNavSelRange = "{2832, 0}";
-			sepNavVisRect = "{{0, 1249}, {577, 612}}";
+			sepNavVisRect = "{{0, 1278}, {577, 612}}";
 			sepNavWindowFrame = "{{176, 135}, {616, 741}}";
 		};
 	};
@@ -503,6 +503,134 @@
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
+	2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "error:column  23 - Identifier not found \"oldlinux\"";
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		rLen = 0;
+		rLoc = 289;
+		rType = 1;
+	};
+	2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1013, 1022}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 0}, {1013, 614}}";
+			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
+		};
+	};
+	2CDC717C0CDB9D150018F966 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "warning:column  5 - Local variable \"i\" is assigned but never used";
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		rLen = 1;
+		rLoc = 4;
+		rType = 1;
+	};
+	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;
+	};
+	2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		name = "USongs.pas: 288";
+		rLen = 0;
+		rLoc = 7664;
+		rType = 0;
+		vrLen = 1174;
+		vrLoc = 7219;
+	};
+	2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		name = "UltraStarDX.pas: 6";
+		rLen = 0;
+		rLoc = 117;
+		rType = 0;
+		vrLen = 131;
+		vrLoc = 0;
+	};
+	2CDC71AD0CDBA6300018F966 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 148";
+		rLen = 0;
+		rLoc = 3441;
+		rType = 0;
+		vrLen = 1295;
+		vrLoc = 2495;
+	};
+	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;
@@ -556,10 +684,80 @@
 		name = "Project Breakpoints";
 		objects = (
 			2CDEA8080CBD7D920096994C /* UMain.pas:293 */,
-			2CF553830CDA578D00627463 /* UMain.pas:148 */,
-			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:8 */,
+			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */,
+			2CDC71950CDB9D430018F966 /* UMain.pas:156 */,
 		);
 	};
+	2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 142";
+		rLen = 0;
+		rLoc = 3295;
+		rType = 0;
+		vrLen = 1288;
+		vrLoc = 2495;
+	};
+	2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
+		name = "UAudio_FFMpeg.pas: 952";
+		rLen = 0;
+		rLoc = 22697;
+		rType = 0;
+		vrLen = 1224;
+		vrLoc = 21473;
+	};
+	2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
+		name = "nux ... is t";
+		rLen = 12;
+		rLoc = 3202;
+		rType = 0;
+		vrLen = 1266;
+		vrLoc = 15619;
+	};
+	2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
+		name = "sdl_image.pas: 130";
+		rLen = 0;
+		rLoc = 8020;
+		rType = 0;
+		vrLen = 832;
+		vrLoc = 7978;
+	};
+	2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
+		name = "sdl.pas: 250";
+		rLen = 0;
+		rLoc = 16506;
+		rType = 0;
+		vrLen = 886;
+		vrLoc = 16376;
+	};
+	2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
+		name = "TempSurface:=TexSur";
+		rLen = 20;
+		rLoc = 11823;
+		rType = 0;
+		vrLen = 1220;
+		vrLoc = 11066;
+	};
+	2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
+		name = "Windows.pas: 114";
+		rLen = 0;
+		rLoc = 2832;
+		rType = 0;
+		vrLen = 1182;
+		vrLoc = 2090;
+	};
 	2CDEA8080CBD7D920096994C /* UMain.pas:293 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -571,7 +769,7 @@
 		hitCount = 1;
 		lineNumber = 293;
 		location = UltraStarDX;
-		modificationTime = 215636526.320362;
+		modificationTime = 215719244.976517;
 		state = 1;
 	};
 	2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */ = {
@@ -894,10 +1092,6 @@
 			sepNavWindowFrame = "{{102, 176}, {1052, 743}}";
 		};
 	};
-	2CF552760CDA419B00627463 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 2CF552660CDA404000627463 /* Messages.pas */;
-	};
 	2CF5529E0CDA42C900627463 /* avcodec.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1013, 28616}}";
@@ -930,18 +1124,6 @@
 			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
 		};
 	};
-	2CF552FF0CDA500800627463 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-	};
-	2CF553040CDA513000627463 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
-	};
-	2CF553060CDA514A00627463 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
-	};
 	2CF553070CDA51B500627463 /* sdlutils.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1013, 61068}}";
@@ -950,55 +1132,7 @@
 			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
 		};
 	};
-	2CF553670CDA575100627463 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
-	};
-	2CF553780CDA575B00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
-		name = "function GetTickCount : Cardinal;";
-		rLen = 35;
-		rLoc = 2755;
-		rType = 0;
-		vrLen = 1149;
-		vrLoc = 1974;
-	};
-	2CF553830CDA578D00627463 /* UMain.pas:148 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		delayBeforeContinue = 0;
-		fileReference = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		hitCount = 1;
-		lineNumber = 148;
-		location = UltraStarDX;
-		modificationTime = 215636536.733827;
-		state = 1;
-	};
-	2CF553940CDA58E900627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
-		name = "{$ifdef fpc}";
-		rLen = 12;
-		rLoc = 11808;
-		rType = 0;
-		vrLen = 1465;
-		vrLoc = 718;
-	};
-	2CF553960CDA58E900627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
-		name = AllocateHWND;
-		rLen = 12;
-		rLoc = 3202;
-		rType = 0;
-		vrLen = 1409;
-		vrLoc = 2690;
-	};
-	2CF553A20CDA59BB00627463 /* UltraStarDX.pas:8 */ = {
+	2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
 		);
@@ -1007,111 +1141,11 @@
 		delayBeforeContinue = 0;
 		fileReference = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
 		hitCount = 1;
-		lineNumber = 8;
+		lineNumber = 6;
 		location = UltraStarDX;
-		modificationTime = 215636528.021684;
+		modificationTime = 215719246.517251;
 		state = 1;
 	};
-	2CF553B10CDA5A2F00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 136";
-		rLen = 0;
-		rLoc = 3282;
-		rType = 0;
-		vrLen = 1064;
-		vrLoc = 3295;
-	};
-	2CF553BB0CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 138";
-		rLen = 0;
-		rLoc = 3295;
-		rType = 0;
-		vrLen = 1415;
-		vrLoc = 2519;
-	};
-	2CF553BC0CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
-		name = "UAudio_FFMpeg.pas: 944";
-		rLen = 0;
-		rLoc = 22728;
-		rType = 0;
-		vrLen = 1145;
-		vrLoc = 21583;
-	};
-	2CF553BD0CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
-		name = AllocateHWND;
-		rLen = 12;
-		rLoc = 3202;
-		rType = 0;
-		vrLen = 1157;
-		vrLoc = 15694;
-	};
-	2CF553BE0CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
-		name = "UltraStarDX.pas: 7";
-		rLen = 0;
-		rLoc = 129;
-		rType = 0;
-		vrLen = 159;
-		vrLoc = 0;
-	};
-	2CF553BF0CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
-		name = "sdl_image.pas: 130";
-		rLen = 0;
-		rLoc = 8020;
-		rType = 0;
-		vrLen = 885;
-		vrLoc = 7978;
-	};
-	2CF553C00CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
-		name = "sdl.pas: 250";
-		rLen = 0;
-		rLoc = 16506;
-		rType = 0;
-		vrLen = 886;
-		vrLoc = 16376;
-	};
-	2CF553C10CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = SDL_ScaleSurfaceRect;
-		rLen = 20;
-		rLoc = 11823;
-		rType = 0;
-		vrLen = 1266;
-		vrLoc = 10980;
-	};
-	2CF553C20CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
-		name = "Windows.pas: 115";
-		rLen = 0;
-		rLoc = 2832;
-		rType = 0;
-		vrLen = 1201;
-		vrLoc = 2027;
-	};
-	2CF553C30CDA5A4D00627463 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF552660CDA404000627463 /* Messages.pas */;
-		name = "Messages.pas: 9";
-		rLen = 0;
-		rLoc = 65;
-		rType = 0;
-		vrLen = 428;
-		vrLoc = 0;
-	};
 	9845B6590B1F9B9E0084DD62 /* SDL.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {948, 1330}}";
@@ -1149,8 +1183,8 @@
 		);
 		breakpoints = (
 			2CDEA8080CBD7D920096994C /* UMain.pas:293 */,
-			2CF553830CDA578D00627463 /* UMain.pas:148 */,
-			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:8 */,
+			2CF553A20CDA59BB00627463 /* UltraStarDX.pas:6 */,
+			2CDC71950CDB9D430018F966 /* UMain.pas:156 */,
 		);
 		breakpointsGroup = 2CDD4B7F0CB9394600549FAC /* XCBreakpointsBucket */;
 		codeSenseManager = 2CDD4B6A0CB9357000549FAC /* Code sense */;
@@ -1256,28 +1290,28 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 215618698;
-			PBXWorkspaceStateSaveDate = 215618698;
+			PBXPerProjectTemplateStateSaveDate = 215718463;
+			PBXWorkspaceStateSaveDate = 215718463;
 		};
 		perUserProjectItems = {
-			2CF552760CDA419B00627463 /* PBXBookmark */ = 2CF552760CDA419B00627463 /* PBXBookmark */;
-			2CF552FF0CDA500800627463 /* PBXBookmark */ = 2CF552FF0CDA500800627463 /* PBXBookmark */;
-			2CF553040CDA513000627463 /* PBXBookmark */ = 2CF553040CDA513000627463 /* PBXBookmark */;
-			2CF553060CDA514A00627463 /* PBXBookmark */ = 2CF553060CDA514A00627463 /* PBXBookmark */;
-			2CF553670CDA575100627463 /* PBXBookmark */ = 2CF553670CDA575100627463 /* PBXBookmark */;
-			2CF553780CDA575B00627463 /* PBXTextBookmark */ = 2CF553780CDA575B00627463 /* PBXTextBookmark */;
-			2CF553940CDA58E900627463 /* PBXTextBookmark */ = 2CF553940CDA58E900627463 /* PBXTextBookmark */;
-			2CF553960CDA58E900627463 /* PBXTextBookmark */ = 2CF553960CDA58E900627463 /* PBXTextBookmark */;
-			2CF553B10CDA5A2F00627463 /* PBXTextBookmark */ = 2CF553B10CDA5A2F00627463 /* PBXTextBookmark */;
-			2CF553BB0CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553BB0CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553BC0CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553BC0CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553BD0CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553BD0CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553BE0CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553BE0CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553BF0CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553BF0CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553C00CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553C00CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553C10CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553C10CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553C20CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553C20CDA5A4D00627463 /* PBXTextBookmark */;
-			2CF553C30CDA5A4D00627463 /* PBXTextBookmark */ = 2CF553C30CDA5A4D00627463 /* PBXTextBookmark */;
+			2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */ = 2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */;
+			2CDC717C0CDB9D150018F966 /* PBXTextBookmark */ = 2CDC717C0CDB9D150018F966 /* PBXTextBookmark */;
+			2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */;
+			2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */;
+			2CDC71AD0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AD0CDBA6300018F966 /* 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 */;
+			2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */;
+			2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */;
 		userBuildSettings = {
@@ -1286,7 +1320,7 @@
 	DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {948, 730}}";
-			sepNavSelRange = "{129, 0}";
+			sepNavSelRange = "{117, 0}";
 			sepNavVisRect = "{{0, 0}, {948, 730}}";
 			sepNavWindowFrame = "{{189, 86}, {987, 859}}";
 		};
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
index f2cf90b5..8caca2d2 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -139,6 +139,8 @@
 		2C4D9E210CC9EF840031092D /* Windows.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E090CC9EF840031092D /* Windows.pas */; };
 		2C4D9E450CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
 		2C4D9E460CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
+		2CDC716C0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
+		2CDC716D0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
 		2CDD4BDE0CB947A400549FAC /* sdl.pas in Sources */ = {isa = PBXBuildFile; fileRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */; };
 		2CDD4BE00CB947B100549FAC /* sdl.pas in Sources */ = {isa = PBXBuildFile; fileRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */; };
 		2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */ = {isa = PBXBuildFile; fileRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; };
@@ -423,6 +425,7 @@
 		2C4D9E040CC9EF840031092D /* OpenGL12.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = OpenGL12.pas; path = Wrapper/OpenGL12.pas; sourceTree = "<group>"; };
 		2C4D9E090CC9EF840031092D /* Windows.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = Windows.pas; path = Wrapper/Windows.pas; sourceTree = "<group>"; };
 		2C4D9E440CC9F0ED0031092D /* switches.inc */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = switches.inc; path = ../switches.inc; sourceTree = SOURCE_ROOT; };
+		2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = StrUtils.pas; path = ../../../Modis/SDK/StrUtils.pas; sourceTree = SOURCE_ROOT; };
 		2CDEA4F60CBD725B0096994C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		2CDEC4CC0CC52E7F00FFA244 /* UltraStarDX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = UltraStarDX.icns; sourceTree = "<group>"; };
 		2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UScreenCredits.pas; path = ../Screens/UScreenCredits.pas; sourceTree = SOURCE_ROOT; };
@@ -680,6 +683,7 @@
 		2CF5508A0CDA228800627463 /* SDK */ = {
 			isa = PBXGroup;
 			children = (
+				2CDC716B0CDB9CB70018F966 /* StrUtils.pas */,
 				2CF552110CDA3D1400627463 /* UPluginDefs.pas */,
 				2CF5508B0CDA22B000627463 /* ModiSDK.pas */,
 			);
@@ -1063,6 +1067,7 @@
 				2CF552B60CDA42C900627463 /* opt.pas in Sources */,
 				2CF552B70CDA42C900627463 /* rational.pas in Sources */,
 				2CF553080CDA51B500627463 /* sdlutils.pas in Sources */,
+				2CDC716C0CDB9CB70018F966 /* StrUtils.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1182,6 +1187,7 @@
 				2CF552AD0CDA42C900627463 /* opt.pas in Sources */,
 				2CF552AE0CDA42C900627463 /* rational.pas in Sources */,
 				2CF553090CDA51B500627463 /* sdlutils.pas in Sources */,
+				2CDC716D0CDB9CB70018F966 /* StrUtils.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};