From f299e9ebd51cc26d30a40ee5edff7ddf2968b2ec Mon Sep 17 00:00:00 2001 From: _AG Date: Mon, 17 Jun 2019 02:10:55 +0200 Subject: Update HUD stuff, bug and format fixes. Added environment variables to premake5.lua. Update README.md --- src/render/Hud.h | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) (limited to 'src/render/Hud.h') diff --git a/src/render/Hud.h b/src/render/Hud.h index 7c06f9e5..c4c43e30 100644 --- a/src/render/Hud.h +++ b/src/render/Hud.h @@ -1,7 +1,15 @@ #pragma once #include "Sprite2d.h" -enum eSprites { +enum eItems +{ + ITEM_ARMOUR = 3, + ITEM_HEALTH = 4, + ITEM_RADAR = 8 +}; + +enum eSprites +{ HUD_FIST, HUD_BAT, HUD_PISTOL, @@ -21,7 +29,8 @@ enum eSprites { HUD_SITEM16 = 21 }; -class CHud { +class CHud +{ public: static CSprite2d *Sprites; @@ -38,23 +47,23 @@ public: static int32 m_ZoneState; static int32 m_ZoneFadeTimer; static int32 m_ZoneNameTimer; - static wchar* &m_pZoneName; - static wchar* m_pLastZoneName; - static wchar* m_ZoneToPrint; - static wchar* &m_pVehicleName; - static wchar* m_pLastVehicleName; - static wchar* m_pVehicleNameToPrint; + static wchar *&m_pZoneName; + static wchar *m_pLastZoneName; + static wchar *m_ZoneToPrint; + static wchar *&m_pVehicleName; + static wchar *m_pLastVehicleName; + static wchar *m_pVehicleNameToPrint; static int32 m_VehicleState; static int32 m_VehicleFadeTimer; static int32 m_VehicleNameTimer; - static wchar* m_Message; - static wchar* m_PagerMessage; + static wchar *m_Message; + static wchar *m_PagerMessage; static bool &m_Wants_To_Draw_Hud; static bool &m_Wants_To_Draw_3dMarkers; static wchar(*m_BigMessage)[128]; - static float* BigMessageInUse; - static float* BigMessageAlpha; - static float* BigMessageX; + static float *BigMessageInUse; + static float *BigMessageAlpha; + static float *BigMessageX; static float &OddJob2OffTimer; static int8 &CounterOnLastFrame; static float &OddJob2XOffset; @@ -75,12 +84,12 @@ public: static void Shutdown(); static void ReInitialise(); static void GetRidOfAllHudMessages(); - static void SetZoneName(wchar* name); - static void SetHelpMessage(wchar* message, bool quick); - static void SetVehicleName(wchar* name); + static void SetZoneName(wchar *name); + static void SetHelpMessage(wchar *message, bool quick); + static void SetVehicleName(wchar *name); static void Draw(); static void DrawAfterFade(); - static void SetMessage(wchar* message); - static void SetBigMessage(wchar* message, int16 style); - static void SetPagerMessage(wchar* message); -}; \ No newline at end of file + static void SetMessage(wchar *message); + static void SetBigMessage(wchar *message, int16 style); + static void SetPagerMessage(wchar *message); +}; -- cgit v1.2.3