diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-02-20 22:04:52 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-02-20 22:04:52 +0000 |
| commit | 6cd34b318fc46620ea85991dd1e03ea390960da3 (patch) | |
| tree | 0a20c064660b03e8d440a517daa76c8707b7f514 /Source/Core/Common/Src/Timer.cpp | |
| parent | f992dae50ddbd7c20d63e6d48d5051fc1d6b392b (diff) | |
The Mega Change Of Doom - or, fixing Stop. Almost. At least it's better than before. However, the OpenGL plugin seems to lose textures a lot between game restarts :P I think the GL plugin needs to do a lot more cleanup.
This change also includes tons of minor code formatting cleanup. Yeah, should've separated it ... sorry :(
Kills the old CPUCompare support. I'll resurrect it if I need it again, right now it mostly clutters the code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2321 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Src/Timer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 7eebddced3..b272092458 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -120,11 +120,12 @@ u64 Timer::GetTimeElapsed(void) std::string Timer::GetTimeElapsedFormatted(void) { // If we have not started yet, return zero - if(m_StartTime == 0) return "00:00:00:000"; + if (m_StartTime == 0) + return "00:00:00:000"; // The number of milliseconds since the start, use a different value if the timer is stopped u32 Milliseconds; - if(m_Running) + if (m_Running) Milliseconds = timeGetTime() - m_StartTime; else Milliseconds = m_LastTime - m_StartTime; |