1 files changed, 106 insertions, 66 deletions
diff --git a/Game/Code/UltraStar.lpi b/Game/Code/UltraStar.lpi
index 1b925455..947c694c 100644
--- a/Game/Code/UltraStar.lpi
+++ b/Game/Code/UltraStar.lpi
@@ -12,7 +12,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="5"/>
+      <ActiveEditorIndexAtStart Value="3"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -41,10 +41,10 @@
       <Unit0>
         <Filename Value="UltraStar.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="1" Y="5"/>
-        <TopLine Value="1"/>
+        <CursorPos X="5" Y="415"/>
+        <TopLine Value="375"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="86"/>
+        <UsageCount Value="87"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -57,9 +57,15 @@
       <Unit2>
         <Filename Value="Classes\UTexture.pas"/>
         <UnitName Value="UTexture"/>
-        <CursorPos X="7" Y="23"/>
-        <TopLine Value="2"/>
+        <CursorPos X="72" Y="338"/>
+        <TopLine Value="318"/>
+        <EditorIndex Value="3"/>
         <UsageCount Value="15"/>
+        <Bookmarks Count="2">
+          <Item0 X="26" Y="339" ID="1"/>
+          <Item1 X="3" Y="961" ID="2"/>
+        </Bookmarks>
+        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="Classes\UCommandLine.pas"/>
@@ -78,9 +84,11 @@
       <Unit5>
         <Filename Value="Classes\ULog.pas"/>
         <UnitName Value="ULog"/>
-        <CursorPos X="5" Y="5"/>
-        <TopLine Value="13"/>
+        <CursorPos X="25" Y="219"/>
+        <TopLine Value="201"/>
+        <EditorIndex Value="1"/>
         <UsageCount Value="13"/>
+        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="Classes\UFiles.pas"/>
@@ -112,8 +120,8 @@
       <Unit10>
         <Filename Value="Classes\UGraphic.pas"/>
         <UnitName Value="UGraphic"/>
-        <CursorPos X="8" Y="245"/>
-        <TopLine Value="224"/>
+        <CursorPos X="1" Y="70"/>
+        <TopLine Value="587"/>
         <UsageCount Value="33"/>
       </Unit10>
       <Unit11>
@@ -135,25 +143,21 @@
         <UnitName Value="UMusic"/>
         <CursorPos X="39" Y="17"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="4"/>
         <UsageCount Value="15"/>
-        <Loaded Value="True"/>
       </Unit13>
       <Unit14>
         <Filename Value="Classes\ULyrics.pas"/>
         <UnitName Value="ULyrics"/>
         <CursorPos X="1" Y="5"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit14>
       <Unit15>
         <Filename Value="Screens\UScreenLoading.pas"/>
         <UnitName Value="UScreenLoading"/>
-        <CursorPos X="8" Y="6"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="5"/>
+        <CursorPos X="24" Y="33"/>
+        <TopLine Value="13"/>
+        <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
         <Filename Value="Menu\UMenu.pas"/>
@@ -186,8 +190,8 @@
       <Unit20>
         <Filename Value="Menu\UDisplay.pas"/>
         <UnitName Value="UDisplay"/>
-        <CursorPos X="54" Y="21"/>
-        <TopLine Value="1"/>
+        <CursorPos X="17" Y="69"/>
+        <TopLine Value="429"/>
         <UsageCount Value="14"/>
       </Unit20>
       <Unit21>
@@ -226,9 +230,7 @@
         <UnitName Value="UScreenEditSub"/>
         <CursorPos X="1" Y="10"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit25>
       <Unit26>
         <Filename Value="switches.inc"/>
@@ -253,9 +255,11 @@
       <Unit29>
         <Filename Value="Screens\UScreenSingModi.pas"/>
         <UnitName Value="UScreenSingModi"/>
-        <CursorPos X="1" Y="24"/>
+        <CursorPos X="5" Y="5"/>
         <TopLine Value="1"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="31"/>
+        <Loaded Value="True"/>
       </Unit29>
       <Unit30>
         <Filename Value="Screens\UScreenCredits.pas"/>
@@ -340,7 +344,7 @@
         <Filename Value="Classes\UDraw.pas"/>
         <UnitName Value="UDraw"/>
         <CursorPos X="7" Y="67"/>
-        <TopLine Value="43"/>
+        <TopLine Value="566"/>
         <UsageCount Value="31"/>
       </Unit41>
       <Unit42>
@@ -361,7 +365,7 @@
         <Filename Value="Classes\UGraphicClasses.pas"/>
         <UnitName Value="UGraphicClasses"/>
         <CursorPos X="1" Y="7"/>
-        <TopLine Value="1"/>
+        <TopLine Value="638"/>
         <UsageCount Value="11"/>
       </Unit44>
       <Unit45>
@@ -381,11 +385,9 @@
       <Unit47>
         <Filename Value="Classes\UCommon.pas"/>
         <UnitName Value="UCommon"/>
-        <CursorPos X="1" Y="40"/>
+        <CursorPos X="21" Y="14"/>
         <TopLine Value="11"/>
-        <EditorIndex Value="5"/>
         <UsageCount Value="15"/>
-        <Loaded Value="True"/>
       </Unit47>
       <Unit48>
         <Filename Value="..\..\..\..\..\lazarus\fpc\2.0.4\source\rtl\objpas\math.pp"/>
@@ -404,8 +406,8 @@
       <Unit50>
         <Filename Value="Classes\TextGL.pas"/>
         <UnitName Value="TextGL"/>
-        <CursorPos X="7" Y="64"/>
-        <TopLine Value="43"/>
+        <CursorPos X="43" Y="18"/>
+        <TopLine Value="1"/>
         <UsageCount Value="13"/>
       </Unit50>
       <Unit51>
@@ -564,80 +566,118 @@
         <UnitName Value="ULyrics_bak"/>
         <CursorPos X="18" Y="9"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="2"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit73>
     </Units>
-    <JumpHistory Count="17" HistoryIndex="16">
+    <JumpHistory Count="27" HistoryIndex="26">
       <Position1>
-        <Filename Value="Screens\UScreenEditSub.pas"/>
-        <Caret Line="1339" Column="11" TopLine="1330"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="24" Column="24" TopLine="1"/>
       </Position1>
       <Position2>
-        <Filename Value="Classes\ULyrics_bak.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="380" Column="10" TopLine="363"/>
       </Position2>
       <Position3>
-        <Filename Value="Classes\ULyrics_bak.pas"/>
-        <Caret Line="99" Column="24" TopLine="72"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position3>
       <Position4>
-        <Filename Value="Classes\ULyrics_bak.pas"/>
-        <Caret Line="89" Column="22" TopLine="66"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="84" Column="45" TopLine="166"/>
       </Position4>
       <Position5>
-        <Filename Value="Classes\ULyrics.pas"/>
-        <Caret Line="1" Column="1" TopLine="66"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position5>
       <Position6>
-        <Filename Value="Classes\ULyrics_bak.pas"/>
-        <Caret Line="82" Column="25" TopLine="62"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="415" Column="1" TopLine="375"/>
       </Position6>
       <Position7>
-        <Filename Value="Screens\UScreenEditSub.pas"/>
-        <Caret Line="5" Column="1" TopLine="1"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="188" Column="1" TopLine="161"/>
       </Position7>
       <Position8>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="14" Column="1" TopLine="1"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="198" Column="16" TopLine="208"/>
       </Position8>
       <Position9>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="229" Column="25" TopLine="209"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position9>
       <Position10>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="16" Column="11" TopLine="1"/>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="104" Column="46" TopLine="84"/>
       </Position10>
       <Position11>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="237" Column="27" TopLine="209"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="341" Column="8" TopLine="315"/>
       </Position11>
       <Position12>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="203" Column="14" TopLine="176"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="540" Column="9" TopLine="513"/>
       </Position12>
       <Position13>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="229" Column="25" TopLine="209"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="754" Column="12" TopLine="719"/>
       </Position13>
       <Position14>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="1059" Column="1" TopLine="1019"/>
       </Position14>
       <Position15>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="203" Column="11" TopLine="183"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="1053" Column="18" TopLine="1019"/>
       </Position15>
       <Position16>
-        <Filename Value="Classes\UMusic.pas"/>
-        <Caret Line="12" Column="11" TopLine="1"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="1051" Column="22" TopLine="1019"/>
       </Position16>
       <Position17>
-        <Filename Value="Classes\UCommon.pas"/>
-        <Caret Line="110" Column="1" TopLine="89"/>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="754" Column="10" TopLine="717"/>
       </Position17>
+      <Position18>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="843" Column="3" TopLine="822"/>
+      </Position18>
+      <Position19>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="845" Column="9" TopLine="814"/>
+      </Position19>
+      <Position20>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="880" Column="13" TopLine="852"/>
+      </Position20>
+      <Position21>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="121" Column="41" TopLine="86"/>
+      </Position21>
+      <Position22>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="406" Column="13" TopLine="375"/>
+      </Position22>
+      <Position23>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position23>
+      <Position24>
+        <Filename Value="Classes\ULog.pas"/>
+        <Caret Line="5" Column="5" TopLine="5"/>
+      </Position24>
+      <Position25>
+        <Filename Value="UltraStar.lpr"/>
+        <Caret Line="111" Column="43" TopLine="91"/>
+      </Position25>
+      <Position26>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="338" Column="54" TopLine="310"/>
+      </Position26>
+      <Position27>
+        <Filename Value="Classes\UTexture.pas"/>
+        <Caret Line="344" Column="31" TopLine="323"/>
+      </Position27>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>