aboutsummaryrefslogtreecommitdiffstats
path: root/src/control/OnscreenTimer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/control/OnscreenTimer.h')
-rw-r--r--src/control/OnscreenTimer.h24
1 files changed, 17 insertions, 7 deletions
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h
index 8c049d7d..a175143f 100644
--- a/src/control/OnscreenTimer.h
+++ b/src/control/OnscreenTimer.h
@@ -1,5 +1,7 @@
#pragma once
+#include "common.h"
+
enum
{
COUNTER_DISPLAY_NUMBER,
@@ -14,27 +16,31 @@ public:
char m_aClockBuffer[40];
bool m_bClockProcessed;
bool m_bClockGoingDown;
+ CRGBA m_aClockColour;
+ bool m_bClockTickThisFrame;
void Process();
void ProcessForDisplayClock();
};
-VALIDATE_SIZE(COnscreenTimerEntry, 0x3C);
-
class COnscreenCounterEntry
{
public:
uint32 m_nCounterOffset;
- char m_aCounterText[10];
+ int32 m_nTotal;
+ char m_aCounterText1[10];
+ char m_aCounterText2[10];
+ uint16 m_nTypeOfTotal;
uint16 m_nType;
char m_aCounterBuffer[40];
bool m_bCounterProcessed;
+ CRGBA m_colour1;
+ CRGBA m_colour2;
+ bool m_bAddDollarPrefix;
void ProcessForDisplayCounter();
};
-VALIDATE_SIZE(COnscreenCounterEntry, 0x3C);
-
class COnscreenTimer
{
public:
@@ -50,8 +56,12 @@ public:
void ClearCounter(uint32 offset);
void ClearClock(uint32 offset);
- void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos);
+ void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos, int32, char*, uint16);
void AddClock(uint32 offset, char* text, bool bGoingDown);
+
+ void ChangeCounterPrefix(uint32 offset, bool bChange);
};
-VALIDATE_SIZE(COnscreenTimer, 0xF4);
+extern CRGBA gbColour;
+extern CRGBA gbColour2;
+