From b212f7c8905fc8ee7d682e3576dda952040e99fd Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 20 Mar 2014 23:06:22 +0100 Subject: [PATCH] Added parameters to Clock class It is now possible to build a Clock object in a paused state, or to give it an "already elapsed time" value Former-commit-id: 20e9c55de8a12a9220f81dc7759a4113a794648f --- include/Nazara/Core/Clock.hpp | 2 +- src/Nazara/Core/Clock.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Core/Clock.hpp b/include/Nazara/Core/Clock.hpp index 672370c60..b510137b7 100644 --- a/include/Nazara/Core/Clock.hpp +++ b/include/Nazara/Core/Clock.hpp @@ -18,7 +18,7 @@ class NAZARA_API NzClock { public: - NzClock(); + NzClock(nzUInt64 startingValue = 0, bool paused = false); float GetSeconds() const; nzUInt64 GetMicroseconds() const; diff --git a/src/Nazara/Core/Clock.cpp b/src/Nazara/Core/Clock.cpp index 53b1bcc65..f1cf8ceb0 100644 --- a/src/Nazara/Core/Clock.cpp +++ b/src/Nazara/Core/Clock.cpp @@ -39,10 +39,10 @@ namespace } } -NzClock::NzClock() : -m_elapsedTime(0), +NzClock::NzClock(nzUInt64 startingValue, bool paused) : +m_elapsedTime(startingValue), m_refTime(NzGetMicroseconds()), -m_paused(false) +m_paused(paused) { }