diff options
| author | aap <aap@papnet.eu> | 2021-01-03 17:01:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 17:01:17 +0100 |
| commit | 65796459343a01ddd17170104599ae340b90bb1d (patch) | |
| tree | d16a5bc09e9cebd006085f30a27dfb3567927ee7 /src/core/Clock.cpp | |
| parent | Merge pull request #921 from TheOfficialFloW/patch-2 (diff) | |
| parent | Pad2 fix (diff) | |
| download | re3-65796459343a01ddd17170104599ae340b90bb1d.tar re3-65796459343a01ddd17170104599ae340b90bb1d.tar.gz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.bz2 re3-65796459343a01ddd17170104599ae340b90bb1d.tar.lz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.xz re3-65796459343a01ddd17170104599ae340b90bb1d.tar.zst re3-65796459343a01ddd17170104599ae340b90bb1d.zip | |
Diffstat (limited to 'src/core/Clock.cpp')
| -rw-r--r-- | src/core/Clock.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp index 6c54ac63..b391e508 100644 --- a/src/core/Clock.cpp +++ b/src/core/Clock.cpp @@ -4,6 +4,7 @@ #include "Pad.h" #include "Clock.h" #include "Stats.h" +#include "VarConsole.h" // --MIAMI: File done @@ -20,6 +21,10 @@ uint32 CClock::ms_nMillisecondsPerGameMinute; uint32 CClock::ms_nLastClockTick; bool CClock::ms_bClockHasBeenStored; +#ifndef MASTER +bool gbFreezeTime; +#endif + void CClock::Initialise(uint32 scale) { @@ -31,6 +36,10 @@ CClock::Initialise(uint32 scale) ms_nLastClockTick = CTimer::GetTimeInMilliseconds(); ms_bClockHasBeenStored = false; debug("CClock ready\n"); +#ifndef MASTER + VarConsole.Add("Time (hour of day)", &ms_nGameClockHours, 1, 0, 23, true); + VarConsole.Add("Freeze time", &gbFreezeTime, true); +#endif } void @@ -50,6 +59,10 @@ CClock::Update(void) } } +#ifndef MASTER + else if (gbFreezeTime) + ms_nLastClockTick = CTimer::GetTimeInMilliseconds(); +#endif else if(CTimer::GetTimeInMilliseconds() - ms_nLastClockTick > ms_nMillisecondsPerGameMinute || gbFastTime) { ms_nGameClockMinutes++; |