summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Clock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Clock.cpp')
-rw-r--r--Stars45/Clock.cpp16
1 files changed, 8 insertions, 8 deletions
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();
}