diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-07-24 20:00:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 20:00:08 +0200 |
| commit | 81ee1c509a8d05189901dd59c268bf47a6188eb8 (patch) | |
| tree | d836f70678f2ce7b5d86a6745f34b45232ff71d0 /src/core/Clock.cpp | |
| parent | update (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.gz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.bz2 re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.lz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.xz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.zst re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.zip | |
Diffstat (limited to 'src/core/Clock.cpp')
| -rw-r--r-- | src/core/Clock.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp index 707b0e57..a97dcb5f 100644 --- a/src/core/Clock.cpp +++ b/src/core/Clock.cpp @@ -15,7 +15,7 @@ uint8 &CClock::ms_Stored_nGameClockHours = *(uint8*)0x95CD7B; uint8 &CClock::ms_Stored_nGameClockMinutes = *(uint8*)0x95CD9B; uint16 &CClock::ms_Stored_nGameClockSeconds = *(uint16*)0x95CC9C; uint32 &CClock::ms_nMillisecondsPerGameMinute = *(uint32*)0x8F2C64; -int32 &CClock::ms_nLastClockTick = *(int32*)0x9430E4; +uint32 &CClock::ms_nLastClockTick = *(uint32*)0x9430E4; bool &CClock::ms_bClockHasBeenStored = *(bool*)0x95CD82; void @@ -67,10 +67,7 @@ CClock::Update(void) } } } - ms_nGameClockSeconds += - 60 - * (CTimer::GetTimeInMilliseconds() - ms_nLastClockTick) - / ms_nMillisecondsPerGameMinute; + ms_nGameClockSeconds = 60 * (CTimer::GetTimeInMilliseconds() - ms_nLastClockTick) / ms_nMillisecondsPerGameMinute; } void |