1 files changed, 27 insertions, 45 deletions

diff --git a/src/render/Hud.h b/src/render/Hud.h
index bef73cc2..adfdf1fc 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -37,63 +37,45 @@ enum eSprites
 class CHud
 {
 public:
+	static int16 m_ItemToFlash;
 	static CSprite2d Sprites[NUM_HUD_SPRITES];
-	static wchar m_HelpMessage[HELP_MSG_LENGTH];
-	static wchar m_LastHelpMessage[HELP_MSG_LENGTH];
-	static uint32 m_HelpMessageState;
-	static uint32 m_HelpMessageTimer;
-	static int32 m_HelpMessageFadeTimer;
-	static wchar m_HelpMessageToPrint[HELP_MSG_LENGTH];
-	static float m_HelpMessageDisplayTime;
-	static bool	m_HelpMessageQuick;
-	static uint32 m_ZoneState;
-	static int32 m_ZoneFadeTimer;
-	static uint32 m_ZoneNameTimer;
 	static wchar *m_pZoneName;
 	static wchar *m_pLastZoneName;
 	static wchar *m_ZoneToPrint;
-	static wchar *m_VehicleName;
-	static wchar *m_pLastVehicleName;
-	static wchar *m_pVehicleNameToPrint;
-	static uint32 m_VehicleState;
-	static int32 m_VehicleFadeTimer;
-	static uint32 m_VehicleNameTimer;
 	static wchar m_Message[256];
+	static wchar m_BigMessage[6][128];
 	static wchar m_PagerMessage[256];
+	static uint32 m_ZoneNameTimer;
+	static int32 m_ZoneFadeTimer;
+	static uint32 m_ZoneState;
+	static wchar m_HelpMessage[HELP_MSG_LENGTH];
+	static wchar m_LastHelpMessage[HELP_MSG_LENGTH];
+	static wchar m_HelpMessageToPrint[HELP_MSG_LENGTH];
+	static uint32 m_HelpMessageTimer;
+	static int32 m_HelpMessageFadeTimer;
+	static uint32 m_HelpMessageState;
+	static bool	m_HelpMessageQuick;
+	static float m_HelpMessageDisplayTime;
+	static int32 SpriteBrightness;
 	static bool m_Wants_To_Draw_Hud;
 	static bool m_Wants_To_Draw_3dMarkers;
-	static wchar m_BigMessage[6][128];
-	static int16 m_ItemToFlash;
-
-	// These aren't really in CHud
-	static float BigMessageInUse[6];
-	static float BigMessageAlpha[6];
-	static float BigMessageX[6];
-	static float OddJob2OffTimer;
-	static bool CounterOnLastFrame;
-	static float OddJob2XOffset;
-	static uint16 CounterFlashTimer;
-	static uint16 OddJob2Timer;
-	static bool TimerOnLastFrame;
-	static int16 OddJob2On;
-	static uint16 TimerFlashTimer;
-	static int16 PagerSoundPlayed;
-	static int32 SpriteBrightness;
-	static float PagerXOffset;
-	static int16 PagerTimer;
-	static int16 PagerOn;
-
+	static wchar *m_pVehicleName;
+	static wchar *m_pLastVehicleName;
+	static uint32 m_VehicleNameTimer;
+	static int32 m_VehicleFadeTimer;
+	static uint32 m_VehicleState;
+	static wchar *m_pVehicleNameToPrint;
 public:
-	static void Draw();
-	static void DrawAfterFade();
-	static void GetRidOfAllHudMessages();
 	static void Initialise();
+	static void Shutdown();
 	static void ReInitialise();
-	static void SetBigMessage(wchar *message, uint16 style);
+	static void GetRidOfAllHudMessages();
+	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, uint16 style);
 	static void SetPagerMessage(wchar *message);
-	static void SetVehicleName(wchar *name);
-	static void SetZoneName(wchar *name);
-	static void Shutdown();
 };