Merge pull request #5 from jealouscloud/develop

lra 1.01
jealouscloud · Oct 22, 2017 · 819e24c · 819e24c
2 parents 6275a72 + 6d9f2ae
commit 819e24c
Show file tree

Hide file tree

Showing 26 changed files with 739 additions and 597 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+lib/**/obj
+lib/.vs
+lib/packages
+lib/**/OpenTK.dll.config
+lib/tools
+src/obj
+src/.vs
+*.dll
+*.pdb
+build/linerider.exe
+build/OpenTK.xml
+*.user
+build/OpenTK.dll.config
diff --git a/lib/Agg/Agg.csproj b/lib/Agg/Agg.csproj
@@ -64,20 +64,19 @@
     <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
     <LangVersion>Default</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\linerider-dependencies\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="OpenTK">
-      <HintPath>..\dependencies\OpenTK.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="agg_array.cs" />
@@ -198,7 +197,8 @@
     <Compile Include="VectorMath\Vector4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="VectorMath\" />
+    <None Include="OpenTK.dll.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/lib/Agg/packages.config b/lib/Agg/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
+</packages>
diff --git a/lib/Gwen.Renderer.OpenTK/Gwen.Renderer.OpenTK.csproj b/lib/Gwen.Renderer.OpenTK/Gwen.Renderer.OpenTK.csproj
@@ -24,11 +24,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisLogFile>bin\Debug\Gwen.Renderer.OpenTK.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
@@ -38,6 +38,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\linerider-dependencies\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -48,16 +51,17 @@
     <Reference Include="Gwen">
       <HintPath>..\dependencies\Gwen.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>..\..\dependencies\OpenTK.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Input\OpenTK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Renderer\OpenTK.cs" />
     <Compile Include="Renderer\TextRenderer.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="OpenTK.dll.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

diff --git a/lib/Gwen.Renderer.OpenTK/packages.config b/lib/Gwen.Renderer.OpenTK/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
+</packages>
diff --git a/lib/Gwen/Gwen.csproj b/lib/Gwen/Gwen.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/lib/LibTessDotNet/LibTessDotNet.csproj b/lib/LibTessDotNet/LibTessDotNet.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -69,10 +69,10 @@
     <AssemblyName>LibTessDotNet.Double</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="OpenTK">
-      <HintPath>..\dependencies\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\linerider-dependencies\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\Dict.cs" />
@@ -85,6 +85,10 @@
     <Compile Include="Sources\Tess.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="OpenTK.dll.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/lib/LibTessDotNet/packages.config b/lib/LibTessDotNet/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
+</packages>
diff --git a/lib/NVorbis/NVorbis.csproj b/lib/NVorbis/NVorbis.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/lib/QuickFont/QuickFont.csproj b/lib/QuickFont/QuickFont.csproj
@@ -18,21 +18,21 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\dependencies</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\linerider-dependencies\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="OpenTK">
-      <HintPath>..\..\dependencies\OpenTK.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\QFontConfiguration.cs" />
@@ -57,6 +57,10 @@
   <ItemGroup>
     <Content Include="ChangeLog.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="OpenTK.dll.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/lib/QuickFont/packages.config b/lib/QuickFont/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="2.0.0" targetFramework="net40-client" />
+</packages>
diff --git a/lib/build.cake b/lib/build.cake
@@ -1,46 +1,32 @@
-
 var target = Argument("target", "Default");
-var configuration = Argument("configuration", "Debug");
-var buildDir = Directory("./dependencies");
 
 Task("Clean")
     .Does(() =>
 {
-    CleanDirectory(buildDir);
+    CleanDirectories("./**/obj");
 });
 
 Task("Restore-NuGet-Packages")
     .IsDependentOn("Clean")
     .Does(() =>
 {
     NuGetInstallFromConfig("./packages.config", new NuGetInstallSettings {
-    OutputDirectory="./dependencies"
+    OutputDirectory="./packages"
     });
-    CopyFiles(new string[] { "./dependencies/OpenTK.2.0.0/lib/net20/OpenTK.dll",
-    "./dependencies/OpenTK.2.0.0/content/OpenTK.dll.config"}, "./dependencies");
+    CopyFiles(new string[] { "./packages/OpenTK.2.0.0/lib/net20/OpenTK.dll",
+    "./packages/OpenTK.2.0.0/content/OpenTK.dll.config"}, "../build");
 });
 
 Task("Build")
   .IsDependentOn("Restore-NuGet-Packages")
   .Does(() =>
 {
-
-    DotNetBuild("./Agg/Agg.csproj", settings => settings.SetConfiguration("Debug"));
-    DotNetBuild("./Gwen/Gwen.csproj", settings => settings.SetConfiguration("Debug"));
-    DotNetBuild("./QuickFont/QuickFont.csproj", settings => settings.SetConfiguration("Debug"));
-    DotNetBuild("./Gwen.Renderer.OpenTK/Gwen.Renderer.OpenTK.csproj", settings => settings.SetConfiguration("Debug"));
-    DotNetBuild("./NVorbis/NVorbis.csproj", settings => settings.SetConfiguration("Debug"));
-    DotNetBuild("./LibTessDotNet/LibTessDotNet.csproj", settings => settings.SetConfiguration("Debug"));
+    DotNetBuild("./linerider-dependencies.sln", settings => settings.SetConfiguration("Debug"));
 });
 Task("Default")
   .IsDependentOn("Build")
   .Does(() =>
 {
-
-    var files = GetFiles("./dependencies/*.dll");
-    CopyFiles(files,"../build");
-    files = GetFiles("./dependencies/*.pdb");
-    CopyFiles(files,"../build");
     Information("Build complete.");
 });
 

diff --git a/lib/linerider-dependencies.sln b/lib/linerider-dependencies.sln
@@ -0,0 +1,83 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.13
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg", "Agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gwen", "Gwen\Gwen.csproj", "{ADDA2F43-96C0-497F-8216-29C67ABC9806}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gwen.Renderer.OpenTK", "Gwen.Renderer.OpenTK\Gwen.Renderer.OpenTK.csproj", "{41650C82-D630-4E5C-845A-F1513C8FDC99}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5EE39029-873A-45A0-9259-2198BF8729F4} = {5EE39029-873A-45A0-9259-2198BF8729F4}
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806} = {ADDA2F43-96C0-497F-8216-29C67ABC9806}
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF} = {BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibTessDotNet", "LibTessDotNet\LibTessDotNet.csproj", "{5EE39029-873A-45A0-9259-2198BF8729F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NVorbis", "NVorbis\NVorbis.csproj", "{A372E591-DFEF-49C4-9C82-98C4361EFCCD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickFont", "QuickFont\QuickFont.csproj", "{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		DebugDouble|Any CPU = DebugDouble|Any CPU
+		Release|Any CPU = Release|Any CPU
+		ReleaseDouble|Any CPU = ReleaseDouble|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.DebugDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.DebugDouble|Any CPU.Build.0 = Debug|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.ReleaseDouble|Any CPU.ActiveCfg = Release|Any CPU
+		{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.ReleaseDouble|Any CPU.Build.0 = Release|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.DebugDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.DebugDouble|Any CPU.Build.0 = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.ReleaseDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADDA2F43-96C0-497F-8216-29C67ABC9806}.ReleaseDouble|Any CPU.Build.0 = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.DebugDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.DebugDouble|Any CPU.Build.0 = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.ReleaseDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{41650C82-D630-4E5C-845A-F1513C8FDC99}.ReleaseDouble|Any CPU.Build.0 = Debug|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.DebugDouble|Any CPU.ActiveCfg = DebugDouble|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.DebugDouble|Any CPU.Build.0 = DebugDouble|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.ReleaseDouble|Any CPU.ActiveCfg = ReleaseDouble|Any CPU
+		{5EE39029-873A-45A0-9259-2198BF8729F4}.ReleaseDouble|Any CPU.Build.0 = ReleaseDouble|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.DebugDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.DebugDouble|Any CPU.Build.0 = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.ReleaseDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{A372E591-DFEF-49C4-9C82-98C4361EFCCD}.ReleaseDouble|Any CPU.Build.0 = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.DebugDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.DebugDouble|Any CPU.Build.0 = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.ReleaseDouble|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBECE6FC-EF63-40F8-A734-A500D1DFC1AF}.ReleaseDouble|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/Controls/GLTrack.cs b/src/Controls/GLTrack.cs
@@ -855,35 +855,32 @@ public void Start(bool ignoreflag = false, bool clearcollidedlines = true, bool
 				}
 				game.Scheduler.Reset();
 				Fpswatch.Restart();
-				if (ghoststart && _flag != null)
-				{
-					var dict = new List<ConcurrentDictionary<int, StandardLine>>();
-					var state = new Rider();
-					Reset(state);
-					List<Rider> states = new List<Rider>();
-					states.Add(state.Clone());
-					for (int i = 0; i < _flag.Frame; i++)
-					{
-						var c = Tick(state);
-						if (c.Count != 0)
-							dict.Add(c);
-						states.Add(state.Clone());
-					}
-
-					for (var i = 0; i < state.ModelAnchors.Length; i++)
+				if (ghoststart && _flag != null)
+                {
+                    foreach (var v in ActiveTriggers)
+                    {
+                        v.Reset();
+                    }
+                    ActiveTriggers.Clear();
+
+                    _track.RiderState.Reset(_track.Start, _track);
+                    _track.Reset();
+                    game.SetIteration(6, true);
+                    for (int i = 0; i < _flag.Frame; i++)
+                    {
+                        _track.NextFrame();
+                    }
+
+					for (var i = 0; i < _track.RiderState.ModelAnchors.Length; i++)
 					{
-						if (state.ModelAnchors[i].Position != _flag.State.ModelAnchors[i].Position ||
-							state.ModelAnchors[i].Prev != _flag.State.ModelAnchors[i].Prev)
+						if (_track.RiderState.ModelAnchors[i].Position != _flag.State.ModelAnchors[i].Position ||
+                            _track.RiderState.ModelAnchors[i].Prev != _flag.State.ModelAnchors[i].Prev)
 						{
 							game.Canvas.SetFlagTooltip(false);
 							game.Invalidate();
 							return;
 						}
 					}
-
-					_track.Frame = _flag.Frame;
-					_track.RiderStates = states;
-					_track.RiderState = states[states.Count - 1].Clone();
 					slider.Min = 0;
 					slider.Max = _track.RiderStates.Count - 1;
 					slider.Value = _track.Frame;