Fix timestamp generation on non-windows

ethanmoffat · May 9, 2023 · 2ff8af3 · 2ff8af3
1 parent 8e05a27
commit 2ff8af3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/EOLib/GameStartTimeRepository.cs b/EOLib/GameStartTimeRepository.cs
@@ -1,13 +1,10 @@
 using AutomaticTypeMapper;
-using System;
 using System.Diagnostics;
 
 namespace EOLib
 {
     public interface IGameStartTimeProvider
     {
-        DateTime StartTime { get; }
-
         Stopwatch Elapsed { get; }
 
         int TimeStamp { get; }
@@ -16,10 +13,8 @@ public interface IGameStartTimeProvider
     [AutoMappedType(IsSingleton = true)]
     public class GameStartTimeRepository : IGameStartTimeProvider
     {
-        public DateTime StartTime { get; } = DateTime.UtcNow;
-
         public Stopwatch Elapsed { get; } = Stopwatch.StartNew();
 
-        public int TimeStamp => StartTime.ToEOTimeStamp(Elapsed.ElapsedTicks);
+        public int TimeStamp => Elapsed.ToEOTimeStamp();
     }
 }
diff --git a/EOLib/misc.cs b/EOLib/misc.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 
 namespace EOLib
 {
@@ -20,10 +21,10 @@ public static T[] SubArray<T>(this T[] arr, int offset, int count)
 
     public static class DateTimeExtension
     {
-        public static int ToEOTimeStamp(this DateTime dt, long elapsedTicks)
+        public static int ToEOTimeStamp(this Stopwatch sw)
         {
-            dt = dt.Add(TimeSpan.FromTicks(elapsedTicks));
-            return dt.Hour * 360000 + dt.Minute * 6000 + dt.Second * 100 + dt.Millisecond / 10;
+            var elapsedHundreths = Math.Round(sw.ElapsedTicks / (Stopwatch.Frequency / 100.0));
+            return (int)elapsedHundreths;
         }
     }