summaryrefslogtreecommitdiffstats
path: root/src/render/Hud.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-28 13:28:42 +0200
committeraap <aap@papnet.eu>2019-06-28 13:28:42 +0200
commit5a93f67c88be5123cbbc2f32b1d3bca231017165 (patch)
tree4c68d9716a756b46b7e0558e1cdf0cddb664b1fa /src/render/Hud.h
parentCStreaming DONE (diff)
downloadre3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar.gz
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar.bz2
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar.lz
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar.xz
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.tar.zst
re3-5a93f67c88be5123cbbc2f32b1d3bca231017165.zip
Diffstat (limited to 'src/render/Hud.h')
-rw-r--r--src/render/Hud.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/render/Hud.h b/src/render/Hud.h
index c4a768f4..1c82b7df 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -34,6 +34,7 @@ class CHud
{
public:
static CSprite2d *Sprites;
+ static int32 &SpriteBrightness;
static wchar *m_HelpMessage;
static wchar *m_LastHelpMessage;
static int32 &m_HelpMessageState;
@@ -47,12 +48,12 @@ public:
static int32 m_ZoneState;
static int32 m_ZoneFadeTimer;
static int32 m_ZoneNameTimer;
- static wchar *&m_ZoneName;
- static wchar *m_LastZoneName;
+ static wchar *&m_pZoneName;
+ static wchar *m_pLastZoneName;
static wchar *m_ZoneToPrint;
static wchar *&m_VehicleName;
- static wchar *m_LastVehicleName;
- static wchar *m_VehicleNameToPrint;
+ static wchar *m_pLastVehicleName;
+ static wchar *m_pVehicleNameToPrint;
static int32 m_VehicleState;
static int32 m_VehicleFadeTimer;
static int32 m_VehicleNameTimer;
@@ -61,7 +62,9 @@ public:
static bool &m_Wants_To_Draw_Hud;
static bool &m_Wants_To_Draw_3dMarkers;
static wchar(*m_BigMessage)[128];
- static wchar *m_LastBigMessage;
+ static int32 m_ItemToFlash;
+
+ // These aren't really in CHud
static float BigMessageInUse[6];
static float BigMessageAlpha[6];
static float BigMessageX[6];
@@ -70,13 +73,11 @@ public:
static float &OddJob2XOffset;
static int16 &CounterFlashTimer;
static int16 &OddJob2Timer;
- static int8 &TimerOnLastFrame;
+ static int8 &TimerOnLastFrame;
static int16 &OddJob2On;
static int16 &TimerFlashTimer;
static int16 &PagerSoundPlayed;
- static int32 &SpriteBrightness;
static float &PagerXOffset;
- static int32 m_ItemToFlash;
static int16 &PagerTimer;
static int16 &PagerOn;