From ecd70a5f17e0aa4f6b0052c01a2170f01b125c5f Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 7 Jun 2019 22:31:03 +0200 Subject: RE more stuff from COnscreenTimer --- src/User.h | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'src/User.h') diff --git a/src/User.h b/src/User.h index 9717fae0..3b88de56 100644 --- a/src/User.h +++ b/src/User.h @@ -1,11 +1,55 @@ #pragma once +#include "common.h" + +class COnscreenTimerEntry +{ +public: + uint32 m_nTimerOffset; + uint32 m_nCounterOffset; + uint8 m_aTimerText[10]; + uint8 m_aCounterText[10]; + uint16 m_nType; + char m_bCounterBuffer[42]; + char m_bTimerBuffer[42]; + bool m_bTimerProcessed; + bool m_bCounterProcessed; + + void Process(); + bool ProcessForDisplay(); + + int ProcessForDisplayTimer(); + int ProcessForDisplayCounter(); +}; + +static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error"); + +class CTheScripts{ +public: + static char *ScriptSpace;//[163840] +}; + class COnscreenTimer { public: - void ProcessForDisplay(void); + COnscreenTimerEntry m_sEntries[1]; + bool m_bProcessed; + bool m_bDisabled; + char field_119[2]; + + int Init(); + void Process(); + void ProcessForDisplay(); + + void ClearCounter(uint32 offset); + void ClearClock(uint32 offset); + + void AddCounter(uint32 offset, uint16 type, char* text); + void AddClock(uint32 offset, char* text); }; +static_assert(sizeof(COnscreenTimer) == 0x78, "COnscreenTimer: error"); + class CPlaceName { }; -- cgit v1.2.3 From bcf44d361df48ad973e77078cfe9884abc9fa60c Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Wed, 12 Jun 2019 11:08:56 +0200 Subject: Add NUMONSCREENTIMERENTRIES in config.h --- src/User.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/User.h') diff --git a/src/User.h b/src/User.h index 3b88de56..b2d0b053 100644 --- a/src/User.h +++ b/src/User.h @@ -32,7 +32,7 @@ public: class COnscreenTimer { public: - COnscreenTimerEntry m_sEntries[1]; + COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES]; bool m_bProcessed; bool m_bDisabled; char field_119[2]; -- cgit v1.2.3