summaryrefslogtreecommitdiffstats
path: root/src/User.h
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2019-06-12 19:20:13 +0200
committerGitHub <noreply@github.com>2019-06-12 19:20:13 +0200
commit38730080a2aa91071ff5d524772874af93cc034e (patch)
tree763b135ff17c75ae83707532b0af91560d0501a3 /src/User.h
parentCameraCreate cosmetic fix (diff)
parentMerge branch 'master' into master (diff)
downloadre3-38730080a2aa91071ff5d524772874af93cc034e.tar
re3-38730080a2aa91071ff5d524772874af93cc034e.tar.gz
re3-38730080a2aa91071ff5d524772874af93cc034e.tar.bz2
re3-38730080a2aa91071ff5d524772874af93cc034e.tar.lz
re3-38730080a2aa91071ff5d524772874af93cc034e.tar.xz
re3-38730080a2aa91071ff5d524772874af93cc034e.tar.zst
re3-38730080a2aa91071ff5d524772874af93cc034e.zip
Diffstat (limited to 'src/User.h')
-rw-r--r--src/User.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/User.h b/src/User.h
index b2d0b053..8b744c7e 100644
--- a/src/User.h
+++ b/src/User.h
@@ -1,14 +1,12 @@
#pragma once
-#include "common.h"
-
class COnscreenTimerEntry
{
public:
uint32 m_nTimerOffset;
uint32 m_nCounterOffset;
- uint8 m_aTimerText[10];
- uint8 m_aCounterText[10];
+ char m_aTimerText[10];
+ char m_aCounterText[10];
uint16 m_nType;
char m_bCounterBuffer[42];
char m_bTimerBuffer[42];
@@ -24,20 +22,14 @@ public:
static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error");
-class CTheScripts{
-public:
- static char *ScriptSpace;//[163840]
-};
-
class COnscreenTimer
{
public:
COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES];
bool m_bProcessed;
bool m_bDisabled;
- char field_119[2];
- int Init();
+ void Init();
void Process();
void ProcessForDisplay();