Merge remote-tracking branch 'origin/develop'

drtchops · Sep 28, 2014 · e2aea7c · e2aea7c
2 parents afe6a02 + 8b271ba
commit e2aea7c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Components/LiveSplit.Skyrim.dll b/Components/LiveSplit.Skyrim.dll
diff --git a/Components/update.LiveSplit.Skyrim.xml b/Components/update.LiveSplit.Skyrim.xml
@@ -1,4 +1,14 @@
 <updates>
+    <update version="1.4.1">
+        <files>
+            <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>
+        </files>
+        <changelog>
+            <change>
+                Fixed incorrect Helgen autosplit.
+            </change>
+        </changelog>
+    </update>
     <update version="1.4.0">
         <files>
             <file path="Components/LiveSplit.Skyrim.dll" status="changed"/>

diff --git a/GameMemory.cs b/GameMemory.cs
@@ -252,7 +252,7 @@ void MemoryReadThread()
                                 // }, null);
 
                                 // if loadscreen starts while leaving helgen
-                                if (locationID == (int)Locations.HelgenKeep01)
+                                if (locationID == (int)Locations.HelgenKeep01 && world_X == -2 && world_Y == -5)
                                 {
                                     // Helgen split
                                     Trace.WriteLine(String.Format("[NoLoads] Helgen Split - {0}", frameCounter));

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
 
 [assembly: ComponentFactory(typeof(SkyrimFactory))]