1 files changed, 17 insertions, 40 deletions

diff --git a/src/core/User.h b/src/core/User.h
index 03ba1bab..02d5f613 100644
--- a/src/core/User.h
+++ b/src/core/User.h
@@ -1,55 +1,31 @@
 #pragma once
 
 #include "Pager.h"
+#include "OnscreenTimer.h"
 
-class COnscreenTimerEntry
-{
-public:
-	uint32 m_nTimerOffset;
-	uint32 m_nCounterOffset;
-	char m_aTimerText[10];
-	char m_aCounterText[10];
-	uint16 m_nType;
-	char m_bCounterBuffer[42];
-	char m_bTimerBuffer[42];
-	bool m_bTimerProcessed;
-	bool m_bCounterProcessed;
-
-	void Process();
-	bool ProcessForDisplay();
-
-	void ProcessForDisplayClock();
-	void ProcessForDisplayCounter();
-};
-
-static_assert(sizeof(COnscreenTimerEntry) == 0x74, "COnscreenTimerEntry: error");
+class CZone;
+class CVehicle;
 
-class COnscreenTimer
+class CPlaceName
 {
+	CZone *m_pZone;
+	CZone *m_pZone2;
+	int16 m_nAdditionalTimer;
 public:
-	COnscreenTimerEntry m_sEntries[NUMONSCREENTIMERENTRIES];
-	bool m_bProcessed;
-	bool m_bDisabled;
-
+	CPlaceName();
 	void 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
-{
+	void Display();
 };
 
 class CCurrentVehicle
 {
+	CVehicle *m_pCurrentVehicle;
+public:
+	CCurrentVehicle();
+	void Init();
+	void Process();
+	void Display();
 };
 
 class CUserDisplay
@@ -60,5 +36,6 @@ public:
 	static CPager &Pager;
 	static CCurrentVehicle &CurrentVehicle;
 
-	static void Process(void);
+	static void Init();
+	static void Process();
 };