summaryrefslogtreecommitdiffstats
path: root/src/control/OnscreenTimer.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-10-11 11:56:33 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-10-11 11:56:33 +0200
commitc4d48213273aad8d1c076ea44238dd65c75d9961 (patch)
tree896772adf77ae80553b9c31b281e234eca10e62a /src/control/OnscreenTimer.h
parentFix sniper and water creatures bug, mark some files (diff)
downloadre3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar.gz
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar.bz2
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar.lz
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar.xz
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.tar.zst
re3-c4d48213273aad8d1c076ea44238dd65c75d9961.zip
Diffstat (limited to '')
-rw-r--r--src/control/OnscreenTimer.h33
1 files changed, 20 insertions, 13 deletions
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h
index 09473397..59014e0b 100644
--- a/src/control/OnscreenTimer.h
+++ b/src/control/OnscreenTimer.h
@@ -9,30 +9,37 @@ enum
class COnscreenTimerEntry
{
public:
- uint32 m_nTimerOffset;
- 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;
- bool m_bCounterProcessed;
+ uint32 m_nOffset;
+ char m_aText[10];
+ char m_bBuffer[42];
+ bool m_bProcessed;
+ bool m_bGoingDown;
+
void Process();
bool ProcessForDisplay();
void ProcessForDisplayClock();
- void ProcessForDisplayCounter();
};
-VALIDATE_SIZE(COnscreenTimerEntry, 0x74);
+class COnscreenCounterEntry
+{
+public:
+ uint32 m_nOffset;
+ char m_aText[10];
+ uint16 m_nType;
+ char m_bBuffer[42];
+ bool m_bProcessed;
+
+ bool ProcessForDisplay();
+ void ProcessForDisplayCounter();
+};
class COnscreenTimer
{
public:
- COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES];
+ COnscreenTimerEntry m_sTimers[NUMONSCREENTIMERENTRIES];
+ COnscreenCounterEntry m_sCounters[NUMONSCREENCOUNTERENTRIES];
bool m_bProcessed;
bool m_bDisabled;