From 35f271d64582e90bf82bde88d48fd631a46dce9e Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Thu, 10 Mar 2022 23:29:13 +0100
Subject: Changed to use default clock duration for elapsed time counting in
 Clock

---
 Stars45/Clock.cpp | 16 ++++++++--------
 Stars45/Clock.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Stars45')

diff --git a/Stars45/Clock.cpp b/Stars45/Clock.cpp
index 4973a5c..5315b99 100644
--- a/Stars45/Clock.cpp
+++ b/Stars45/Clock.cpp
@@ -14,8 +14,8 @@ static constexpr double STARTING_DELTA {1.0 / 60.0};
 
 Clock::Clock() :
     m_point {inner_clock::now()},
-    m_game_elapsed {elapsed_duration::zero()},
-    m_real_elapsed {elapsed_duration::zero()},
+    m_game_elapsed {inner_clock::duration::zero()},
+    m_real_elapsed {inner_clock::duration::zero()},
     m_compression {NO_COMPRESSION},
     m_delta {STARTING_DELTA},
     m_gui_delta {STARTING_DELTA}
@@ -36,8 +36,8 @@ double
 Clock::Step()
 {
     const auto next = inner_clock::now();
-    const auto delta = std::chrono::duration_cast<elapsed_duration>(next - m_point);
-    m_game_elapsed += std::chrono::duration_cast<elapsed_duration>(delta * m_compression);
+    const auto delta = next - m_point;
+    m_game_elapsed += std::chrono::duration_cast<inner_clock::duration>(delta * m_compression);
     m_real_elapsed += delta;
     const std::chrono::duration<double> seconds = delta;
     m_delta = seconds.count() * m_compression;
@@ -50,7 +50,7 @@ Clock::Step()
 void
 Clock::ResetGameTime()
 {
-    m_game_elapsed = elapsed_duration::zero();
+    m_game_elapsed = inner_clock::duration::zero();
 }
 
 
@@ -58,7 +58,7 @@ void
 Clock::SkipGameTime(double seconds)
 {
     const std::chrono::duration<double> skip {seconds};
-    m_game_elapsed += std::chrono::duration_cast<elapsed_duration>(skip);
+    m_game_elapsed += std::chrono::duration_cast<inner_clock::duration>(skip);
 }
 
 
@@ -86,14 +86,14 @@ Clock::TimeCompression() const
 Clock::count_type
 Clock::GameTime() const
 {
-    return m_game_elapsed.count();
+    return std::chrono::duration_cast<elapsed_duration>(m_game_elapsed).count();
 }
 
 
 Clock::count_type
 Clock::RealTime() const
 {
-    return m_real_elapsed.count();
+    return std::chrono::duration_cast<elapsed_duration>(m_real_elapsed).count();
 }
 
 
diff --git a/Stars45/Clock.h b/Stars45/Clock.h
index d7b41a7..5628e45 100644
--- a/Stars45/Clock.h
+++ b/Stars45/Clock.h
@@ -34,8 +34,8 @@ public:
 
 protected:
     inner_clock::time_point m_point;
-    elapsed_duration m_game_elapsed;
-    elapsed_duration m_real_elapsed;
+    inner_clock::duration m_game_elapsed;
+    inner_clock::duration m_real_elapsed;
     double m_compression;
     double m_delta;
     double m_gui_delta;
-- 
cgit v1.1