sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Clock::Get[*] still running when clock is paused 

Former-commit-id: f2063a94251fc27da492d0d37bd42355125a1a24
This commit is contained in:
Lynix 2014-03-20 23:00:54 +01:00
parent 8c7b8435f9
commit 2ea87a601a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Core/Clock.cpp
View File

@ -55,7 +55,11 @@ nzUInt64 NzClock::GetMicroseconds() const
{ {
NazaraLock(m_mutex); NazaraLock(m_mutex);
return m_elapsedTime + (NzGetMicroseconds()-m_refTime); nzUInt64 elapsedMicroseconds = m_elapsedTime;
if (!m_paused)
elapsedMicroseconds += (NzGetMicroseconds() - m_refTime);
return elapsedMicroseconds;
} }
nzUInt64 NzClock::GetMilliseconds() const nzUInt64 NzClock::GetMilliseconds() const