diff options
author | erorcun <erayorcunus@gmail.com> | 2020-10-12 10:13:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-12 10:13:46 +0200 |
commit | 9e0b23f06517e6ead7ae63dcf899e58387474cb3 (patch) | |
tree | e77c7603491b84f7ecc9411f412343484c873036 /src/control/OnscreenTimer.h | |
parent | Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad (diff) | |
parent | Hud, Fire, OnscreenBlaBla (diff) | |
download | re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.gz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.bz2 re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.lz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.xz re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.tar.zst re3-9e0b23f06517e6ead7ae63dcf899e58387474cb3.zip |
Diffstat (limited to 'src/control/OnscreenTimer.h')
-rw-r--r-- | src/control/OnscreenTimer.h | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h index 09473397..8c049d7d 100644 --- a/src/control/OnscreenTimer.h +++ b/src/control/OnscreenTimer.h @@ -9,30 +9,37 @@ enum class COnscreenTimerEntry { public: - uint32 m_nTimerOffset; + uint32 m_nClockOffset; + char m_aClockText[10]; + char m_aClockBuffer[40]; + bool m_bClockProcessed; + bool m_bClockGoingDown; + + void Process(); + void ProcessForDisplayClock(); +}; + +VALIDATE_SIZE(COnscreenTimerEntry, 0x3C); + +class COnscreenCounterEntry +{ +public: uint32 m_nCounterOffset; - char m_aTimerText[10]; char m_aCounterText[10]; uint16 m_nType; - char m_bCounterBuffer[42]; - char m_bTimerBuffer[42]; - bool m_bTimerProcessed; - bool m_bTimerGoingDown; + char m_aCounterBuffer[40]; bool m_bCounterProcessed; - void Process(); - bool ProcessForDisplay(); - - void ProcessForDisplayClock(); void ProcessForDisplayCounter(); }; -VALIDATE_SIZE(COnscreenTimerEntry, 0x74); +VALIDATE_SIZE(COnscreenCounterEntry, 0x3C); class COnscreenTimer { public: - COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES]; + COnscreenTimerEntry m_sClocks[NUMONSCREENCLOCKS]; + COnscreenCounterEntry m_sCounters[NUMONSCREENCOUNTERS]; bool m_bProcessed; bool m_bDisabled; @@ -47,4 +54,4 @@ public: void AddClock(uint32 offset, char* text, bool bGoingDown); }; -VALIDATE_SIZE(COnscreenTimer, 0x78); +VALIDATE_SIZE(COnscreenTimer, 0xF4); |