diff options
| author | aap <aap@papnet.eu> | 2019-07-17 21:46:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 21:46:17 +0200 |
| commit | 04f1e873f96e24988b96f3a81e32b4a6d7901741 (patch) | |
| tree | d6158ded0c7b1a9042333199351e8d081af58c3e /src/core | |
| parent | Merge pull request #140 from Nick007J/master (diff) | |
| parent | Fluff (diff) | |
| download | re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar.gz re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar.bz2 re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar.lz re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar.xz re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.tar.zst re3-04f1e873f96e24988b96f3a81e32b4a6d7901741.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Clock.cpp | 7 | ||||
| -rw-r--r-- | src/core/Clock.h | 2 | ||||
| -rw-r--r-- | src/core/Stats.cpp | 1 | ||||
| -rw-r--r-- | src/core/Stats.h | 1 |
4 files changed, 5 insertions, 6 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 diff --git a/src/core/Clock.h b/src/core/Clock.h index e11b2293..ea4263bd 100644 --- a/src/core/Clock.h +++ b/src/core/Clock.h @@ -9,7 +9,7 @@ class CClock static uint8 &ms_Stored_nGameClockMinutes; static uint16 &ms_Stored_nGameClockSeconds; static uint32 &ms_nMillisecondsPerGameMinute; - static int32 &ms_nLastClockTick; + static uint32 &ms_nLastClockTick; static bool &ms_bClockHasBeenStored; public: diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp index 921586bb..01bbf82e 100644 --- a/src/core/Stats.cpp +++ b/src/core/Stats.cpp @@ -4,6 +4,7 @@ int32 &CStats::DaysPassed = *(int32*)0x8F2BB8; int32 &CStats::HeadShots = *(int32*)0x8F647C; bool& CStats::CommercialPassed = *(bool*)0x8F4334; +bool& CStats::IndustrialPassed = *(bool*)0x8E2A68; int32 &CStats::NumberKillFrenziesPassed = *(int32*)0x8E287C; int32 &CStats::PeopleKilledByOthers = *(int32*)0x8E2C50; diff --git a/src/core/Stats.h b/src/core/Stats.h index 30058a59..c536465f 100644 --- a/src/core/Stats.h +++ b/src/core/Stats.h @@ -6,6 +6,7 @@ public: static int32 &DaysPassed; static int32 &HeadShots; static bool& CommercialPassed; + static bool& IndustrialPassed; static int32 &NumberKillFrenziesPassed; static int32 &PeopleKilledByOthers; |