9 files changed, 226 insertions, 81 deletions

diff --git a/src/control/OnscreenTimer.cpp b/src/control/OnscreenTimer.cpp
index 5045c1e0..fc56f7cb 100644
--- a/src/control/OnscreenTimer.cpp
+++ b/src/control/OnscreenTimer.cpp
@@ -9,18 +9,31 @@
 #include "OnscreenTimer.h"
 #include "Camera.h"
 
+CRGBA gbColour(255, 255, 255, 255);
+CRGBA gbColour2(255, 255, 255, 255);
+
 void
 COnscreenTimer::Init()
 {
 	m_bDisabled = false;
 	for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
 		m_sCounters[i].m_nCounterOffset = 0;
+		m_sCounters[i].m_nTotal = -1;
 
-		for(uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText); j++)
-			m_sCounters[i].m_aCounterText[j] = '\0';
+		for (uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText1); j++) {
+			m_sCounters[i].m_aCounterText1[j] = '\0';
+		}
+
+		for (uint32 j = 0; j < ARRAY_SIZE(m_sCounters[0].m_aCounterText2); j++) {
+			m_sCounters[i].m_aCounterText2[j] = '\0';
+		}
 
 		m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
+		m_sCounters[i].m_nTypeOfTotal = 0;
 		m_sCounters[i].m_bCounterProcessed = false;
+		m_sCounters[i].m_colour1 = CRGBA(112, 132, 157, 255);
+		m_sCounters[i].m_colour2 = CRGBA(42, 58, 81, 255);
+
 	}
 	for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
 		m_sClocks[i].m_nClockOffset = 0;
@@ -30,6 +43,8 @@ COnscreenTimer::Init()
 
 		m_sClocks[i].m_bClockProcessed = false;
 		m_sClocks[i].m_bClockGoingDown = true;
+		m_sClocks[i].m_aClockColour = CRGBA(244, 225, 91, 255);
+		m_sClocks[i].m_bClockTickThisFrame = false;
 	}
 }
 
@@ -44,6 +59,10 @@ COnscreenTimer::Process()
 void
 COnscreenTimer::ProcessForDisplay()
 {
+#ifdef GTA_NETWORK
+	if (gIsMultiplayerGame)
+		return;
+#endif
 	if(CHud::m_Wants_To_Draw_Hud) {
 		m_bProcessed = false;
 		for(uint32 i = 0; i < NUMONSCREENCLOCKS; i++) {
@@ -71,9 +90,12 @@ COnscreenTimer::ClearCounter(uint32 offset)
 	for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
 		if(offset == m_sCounters[i].m_nCounterOffset) {
 			m_sCounters[i].m_nCounterOffset = 0;
-			m_sCounters[i].m_aCounterText[0] = '\0';
+			m_sCounters[i].m_aCounterText1[0] = '\0';
+			m_sCounters[i].m_aCounterText2[0] = '\0';
+			m_sCounters[i].m_nTypeOfTotal = 0;
 			m_sCounters[i].m_nType = COUNTER_DISPLAY_NUMBER;
 			m_sCounters[i].m_bCounterProcessed = false;
+			m_sCounters[i].m_bAddDollarPrefix = false;
 		}
 	}
 }
@@ -87,22 +109,45 @@ COnscreenTimer::ClearClock(uint32 offset)
 			m_sClocks[i].m_aClockText[0] = '\0';
 			m_sClocks[i].m_bClockProcessed = false;
 			m_sClocks[i].m_bClockGoingDown = true;
+			m_sClocks[i].m_bClockTickThisFrame = false;
 		}
 }
 
 void
-COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos)
+COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text1, uint16 pos, int32 total, char* text2, uint16 totalType)
 {
-	if (m_sCounters[pos].m_aCounterText[0] != '\0')
+	if (m_sCounters[pos].m_nCounterOffset)
 		return;
 
 	m_sCounters[pos].m_nCounterOffset = offset;
-	if(text)
-		strncpy(m_sCounters[pos].m_aCounterText, text, ARRAY_SIZE(m_sCounters[0].m_aCounterText));
+	m_sCounters[pos].m_nTotal = total;
+	if(text1)
+		strncpy(m_sCounters[pos].m_aCounterText1, text1, ARRAY_SIZE(m_sCounters[0].m_aCounterText1));
+	else
+		m_sCounters[pos].m_aCounterText1[0] = '\0';
+
+	if (text2)
+		strncpy(m_sCounters[pos].m_aCounterText2, text2, ARRAY_SIZE(m_sCounters[0].m_aCounterText2));
 	else
-		m_sCounters[pos].m_aCounterText[0] = '\0';
+		m_sCounters[pos].m_aCounterText2[0] = '\0';
 
+	m_sCounters[pos].m_nTypeOfTotal = totalType;
 	m_sCounters[pos].m_nType = type;
+	m_sCounters[pos].m_bAddDollarPrefix = 0;
+
+	if (gbColour == CRGBA(255, 255, 255, 255))
+		m_sCounters[pos].m_colour1 = CRGBA(112, 132, 157, 255);
+	else {
+		m_sCounters[pos].m_colour1 = gbColour;
+		gbColour = CRGBA(255, 255, 255, 255);
+	}
+		
+	if (gbColour == CRGBA(255, 255, 255, 255))
+		m_sCounters[pos].m_colour2 = CRGBA(42, 58, 81, 255);
+	else {
+		m_sCounters[pos].m_colour2 = gbColour;
+		gbColour = CRGBA(255, 255, 255, 255);
+	}
 }
 
 void
@@ -112,6 +157,13 @@ COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown)
 		if(m_sClocks[i].m_nClockOffset == 0) {
 			m_sClocks[i].m_nClockOffset = offset;
 			m_sClocks[i].m_bClockGoingDown = bGoingDown;
+			m_sClocks[i].m_bClockTickThisFrame = false;
+			if (gbColour == CRGBA(255, 255, 255, 255))
+				m_sClocks[i].m_aClockColour = CRGBA(244, 225, 91, 255);
+			else {
+				m_sClocks[i].m_aClockColour = gbColour;
+				gbColour = CRGBA(255, 255, 255, 255);
+			}
 			if(text)
 				strncpy(m_sClocks[i].m_aClockText, text, ARRAY_SIZE(m_sClocks[0].m_aClockText));
 			else
@@ -140,8 +192,12 @@ COnscreenTimerEntry::Process()
 		}
 		else {
 			int32 oldTimeSeconds = oldTime / 1000;
-			if (oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds && !TheCamera.m_WideScreenOn) {
-				DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
+			if (oldTimeSeconds < 12) {
+				m_bClockTickThisFrame = false;
+				if (newTime / 1000 != oldTimeSeconds) {
+					m_bClockTickThisFrame = true;
+					DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
+				}
 			}
 		}
 	}
@@ -161,5 +217,28 @@ void
 COnscreenCounterEntry::ProcessForDisplayCounter()
 {
 	uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset);
-	sprintf(m_aCounterBuffer, "%d", counter);
+	char prefix[2] = { '\0' };
+	if (m_bAddDollarPrefix)
+		sprintf(prefix, "$");
+#ifdef FIX_BUGS
+	char suffix[4] = { '\0' };
+#else
+	char suffix[2] = { '\0' };
+#endif
+	if (m_nTotal != -1) {
+		m_nTotal = Min(99, m_nTotal);
+		sprintf(suffix, "/%d", m_nTotal);
+	}
+	sprintf(m_aCounterBuffer, "%s%d%s", prefix, counter, suffix);
+}
+
+void
+COnscreenTimer::ChangeCounterPrefix(uint32 offset, bool bChange)
+{
+	for (uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
+		if (offset == m_sCounters[i].m_nCounterOffset) {
+			m_sCounters[i].m_bAddDollarPrefix = bChange;
+			return;
+		}
+	}
 }
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h
index 8c049d7d..a175143f 100644
--- a/src/control/OnscreenTimer.h
+++ b/src/control/OnscreenTimer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common.h"
+
 enum
 {
 	COUNTER_DISPLAY_NUMBER,
@@ -14,27 +16,31 @@ public:
 	char m_aClockBuffer[40];
 	bool m_bClockProcessed;
 	bool m_bClockGoingDown;
+	CRGBA m_aClockColour;
+	bool m_bClockTickThisFrame;
 
 	void Process();
 	void ProcessForDisplayClock();
 };
 
-VALIDATE_SIZE(COnscreenTimerEntry, 0x3C);
-
 class COnscreenCounterEntry
 {
 public:
 	uint32 m_nCounterOffset;
-	char m_aCounterText[10];
+	int32 m_nTotal;
+	char m_aCounterText1[10];
+	char m_aCounterText2[10];
+	uint16 m_nTypeOfTotal;
 	uint16 m_nType;
 	char m_aCounterBuffer[40];
 	bool m_bCounterProcessed;
+	CRGBA m_colour1;
+	CRGBA m_colour2;
+	bool m_bAddDollarPrefix;
 
 	void ProcessForDisplayCounter();
 };
 
-VALIDATE_SIZE(COnscreenCounterEntry, 0x3C);
-
 class COnscreenTimer
 {
 public:
@@ -50,8 +56,12 @@ public:
 	void ClearCounter(uint32 offset);
 	void ClearClock(uint32 offset);
 
-	void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos);
+	void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos, int32, char*, uint16);
 	void AddClock(uint32 offset, char* text, bool bGoingDown);
+
+	void ChangeCounterPrefix(uint32 offset, bool bChange);
 };
 
-VALIDATE_SIZE(COnscreenTimer, 0xF4);
+extern CRGBA gbColour;
+extern CRGBA gbColour2;
+
diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp
index 2fd1c322..b6489843 100644
--- a/src/control/Script10.cpp
+++ b/src/control/Script10.cpp
@@ -242,7 +242,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
 	{
 		uint16 offset = (uint8*)GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - CTheScripts::ScriptSpace;
 		CollectParameters(&m_nIp, 1);
-		//CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAMS(0));
+		CUserDisplay::OnscnTimer.ChangeCounterPrefix(offset, GET_INTEGER_PARAM(0) != 0);
 		return 0;
 	}
 	case COMMAND_STORE_PLAYER_OUTFIT:
@@ -263,7 +263,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
 		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
 		strncpy(onscreen_str1, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0); // TODO - second set of data
+		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0, GET_INTEGER_PARAM(0), nil, 0);
 		return 0;
 	}
 	case COMMAND_SET_PLAYER_CURRENT_WEAPON_AMMO_IN_CLIP:
@@ -322,7 +322,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
 		wchar* text2 = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
 		strncpy(onscreen_str2, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str1, 0); // TODO - second set of data
+		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(1), onscreen_str2, 0, GET_INTEGER_PARAM(0), onscreen_str1, GET_INTEGER_PARAM(2));
 		return 0;
 	}
 	case COMMAND_GET_PLAYER_STORED_WEAPON:
diff --git a/src/control/Script2.cpp b/src/control/Script2.cpp
index 6f6e89cc..26c1cdde 100644
--- a/src/control/Script2.cpp
+++ b/src/control/Script2.cpp
@@ -190,7 +190,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	{
 		uint16 counter = (uint8*)GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - CTheScripts::ScriptSpace;
 		CollectParameters(&m_nIp, 1);
-		CUserDisplay::OnscnTimer.AddCounter(counter, GET_INTEGER_PARAM(0), nil, 0);
+		CUserDisplay::OnscnTimer.AddCounter(counter, GET_INTEGER_PARAM(0), nil, 0, -1, nil, 0);
 		return 0;
 	}
 	case COMMAND_CLEAR_ONSCREEN_COUNTER:
diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index 7ff785d5..486ff39a 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1771,7 +1771,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
 		strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, 0);
+		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, 0, -1, nil, 0);
 		return 0;
 	}
 	case COMMAND_CREATE_RANDOM_CAR_FOR_CAR_PARK:
diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp
index de389a13..ee197783 100644
--- a/src/control/Script7.cpp
+++ b/src/control/Script7.cpp
@@ -570,7 +570,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
 		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
 		strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, GET_INTEGER_PARAM(1) - 1); // TODO: last params are -1, nil, 0
+		CUserDisplay::OnscnTimer.AddCounter(var, GET_INTEGER_PARAM(0), onscreen_str, GET_INTEGER_PARAM(1) - 1, -1, nil, 0);
 		return 0;
 	}
 	case COMMAND_ADD_SET_PIECE:
diff --git a/src/control/Script9.cpp b/src/control/Script9.cpp
index aaef8b6f..f5b964ad 100644
--- a/src/control/Script9.cpp
+++ b/src/control/Script9.cpp
@@ -13,6 +13,7 @@
 #include "Hud.h"
 #include "Messages.h"
 #include "Object.h"
+#include "OnscreenTimer.h"
 #include "Pad.h"
 #include "Ped.h"
 #include "Pools.h"
@@ -617,11 +618,11 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command)
 		return 0;
 	case COMMAND_SET_ONSCREEN_TIMER_COLOUR:
 		CollectParameters(&m_nIp, 4);
-		// gbColour = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
+		gbColour = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
 		return 0;
 	case COMMAND_SET_ONSCREEN_TIMER_BACKGROUND_COLOUR:
 		CollectParameters(&m_nIp, 4);
-		// gbColour2 = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
+		gbColour2 = CRGBA(GET_INTEGER_PARAM(0), GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2), GET_INTEGER_PARAM(3));
 		return 0;
 	case COMMAND_REMOVE_CAR_BOOT:
 	{
diff --git a/src/renderer/Hud.cpp b/src/renderer/Hud.cpp
index ec8e66c8..8b021645 100644
--- a/src/renderer/Hud.cpp
+++ b/src/renderer/Hud.cpp
@@ -913,8 +913,35 @@ void CHud::Draw()
 		*/
 		
 		wchar sTimer[16];
+		uint16 nNumBigOnscrnLines = 0;
+		for (uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
+			if (CUserDisplay::OnscnTimer.m_sCounters[i].m_bCounterProcessed) {
+				if (!CounterOnLastFrame[i])
+					CounterFlashTimer[i] = 1;
 
-		if (!CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockProcessed)
+				CounterOnLastFrame[i] = true;
+
+				if (CounterFlashTimer[i] != 0) {
+					if (++CounterFlashTimer[i] > 50)
+						CounterFlashTimer[i] = 0;
+				}
+
+				if (FRAMECOUNTER & 4 || CounterFlashTimer[i] == 0) {
+					if (CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText2[0] != '\0') {
+						wchar* pCounterText = TheText.Get(CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText2);
+						UseTimerCounterFontSettings();
+						CFont::SetPropOn();
+						CFont::SetColor(CRGBA(255, 255, 255, m_HudAlpha));
+						CFont::SetScale(PSP_SCREEN_SCALE_X(0.7f), PSP_SCREEN_SCALE_Y(1.5217391f));
+						CFont::PrintString(PSP_SCREEN_SCALE_FROM_RIGHT(12.0f), PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines) + PSP_SCREEN_SCALE_Y(100.0f), pCounterText);
+					}
+				}
+				if (CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText2[0] != '\0')
+					nNumBigOnscrnLines++;
+			}
+		}
+
+		if (!CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockProcessed || CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockTickThisFrame)
 			TimerOnLastFrame = false;
 
 		for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
@@ -923,43 +950,45 @@ void CHud::Draw()
 		}
 
 		if (CUserDisplay::OnscnTimer.m_bProcessed) {
-			if (CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockProcessed) {
+			if (CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockProcessed && !CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockTickThisFrame) {
 				if (!TimerOnLastFrame)
 					TimerFlashTimer = 1;
 
 				TimerOnLastFrame = true;
 
-				if (TimerFlashTimer != 0) {
-					if (++TimerFlashTimer > 50)
-						TimerFlashTimer = 0;
-				}
-
 				if (FRAMECOUNTER & 4 || TimerFlashTimer == 0) {
 					AsciiToUnicode(CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockBuffer, sTimer);
-					CFont::SetPropOn();
-					CFont::SetBackgroundOff();
-					CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-					CFont::SetRightJustifyOn();
-					CFont::SetRightJustifyWrap(0.0f);
-					CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+					UseTimerCounterFontSettings();
 					CFont::SetPropOff();
-					CFont::SetBackGroundOnlyTextOn();
-					CFont::SetDropShadowPosition(2);
-					CFont::SetDropColor(CRGBA(0, 0, 0, 255));
-					CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-					CFont::SetColor(TIMER_COLOR);
-					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(37.0f), SCREEN_SCALE_Y(110.0f), sTimer);
-					CFont::SetPropOn();
+					CFont::SetColor(CRGBA(
+						CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.r,
+						CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.g,
+						CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.b,
+						m_HudAlpha));
+					CFont::PrintString(PSP_SCREEN_SCALE_FROM_RIGHT(12.0f), PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines) + PSP_SCREEN_SCALE_Y(100.0f), sTimer);
 
 					if (CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockText[0]) {
-						CFont::SetDropShadowPosition(2);
-						CFont::SetDropColor(CRGBA(0, 0, 0, 255));
-						CFont::SetColor(TIMER_COLOR);
-						CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(37.0f) - SCREEN_SCALE_X(80.0f), SCREEN_SCALE_Y(110.0f), TheText.Get(CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockText));
+						float width = CFont::GetStringWidth(sTimer) + PSP_SCREEN_SCALE_Y(4.0f);
+						CFont::SetPropOn();
+						CFont::SetColor(CRGBA(
+							CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.r,
+							CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.g,
+							CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockColour.b,
+							m_HudAlpha));
+						CFont::PrintString(PSP_SCREEN_SCALE_FROM_RIGHT(12.0f) - width, PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines) + PSP_SCREEN_SCALE_Y(100.0f), TheText.Get(CUserDisplay::OnscnTimer.m_sClocks[0].m_aClockText));
 					}
 				}
+
+				if (TimerFlashTimer != 0) {
+					if (++TimerFlashTimer > 50)
+						TimerFlashTimer = 0;
+				}
 			}
 
+			int nNumOnscrnLines = 0;
+			if (CUserDisplay::OnscnTimer.m_sClocks[0].m_bClockProcessed)
+				nNumOnscrnLines = 1;
+
 			for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {
 				if (CUserDisplay::OnscnTimer.m_sCounters[i].m_bCounterProcessed) {
 					if (!CounterOnLastFrame[i])
@@ -972,52 +1001,62 @@ void CHud::Draw()
 							CounterFlashTimer[i] = 0;
 					}
 
-					if (FRAMECOUNTER & 4 || CounterFlashTimer[i] == 0) {
+					if (FRAMECOUNTER & 4 || CounterFlashTimer[i] == 0 || CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText2[0] != '\0') {
+						float sizeOfCounter;
 						if (CUserDisplay::OnscnTimer.m_sCounters[i].m_nType == COUNTER_DISPLAY_NUMBER) {
 							AsciiToUnicode(CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterBuffer, sTimer);
-							CFont::SetPropOn();
-							CFont::SetBackgroundOff();
-							CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-							CFont::SetCentreOff();
-							CFont::SetRightJustifyOn();
-							CFont::SetRightJustifyWrap(0.0f);
-							CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-							CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
-							CFont::SetPropOn();
-							CFont::SetBackGroundOnlyTextOn();
-							CFont::SetDropShadowPosition(2);
-							CFont::SetDropColor(CRGBA(0, 0, 0, 255));
-							CFont::SetColor(COUNTER_COLOR);
-							CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(37.0f), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y * 20.f * i) + SCREEN_SCALE_Y(132.0f), sTimer);
+							UseTimerCounterFontSettings();
+							CFont::SetPropOff();
+							CFont::SetColor(CRGBA(
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.r,
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.g,
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.b,
+								m_HudAlpha));
+							sizeOfCounter = CFont::GetStringWidth(sTimer) + PSP_SCREEN_SCALE_X(4.0f);
+							CFont::PrintString(PSP_SCREEN_SCALE_FROM_RIGHT(12.0f), PSP_SCREEN_SCALE_Y(100.0f) + PSP_SCREEN_SCALE_Y(20.0f * nNumOnscrnLines) + PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines), sTimer);
 						} else {
 							int counter = atoi(CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterBuffer);
 
-							const float barWidth = SCREEN_SCALE_X(100.f / 2.f);
-							const float right = SCREEN_SCALE_FROM_RIGHT(37.0f);
+							const float barWidth = PSP_SCREEN_SCALE_X(92.f / 2.f);
+							const float right = PSP_SCREEN_SCALE_FROM_RIGHT(12.0f);
 							const float left = right - barWidth;
 
-							const float barHeight = SCREEN_SCALE_Y(11.0f);
-							const float top = SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(8.0f) + SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y * 20.f * i);
+							const float barHeight = PSP_SCREEN_SCALE_Y(11.0f);
+							const float top = PSP_SCREEN_SCALE_Y(100.0f) + PSP_SCREEN_SCALE_Y(20.0f * nNumOnscrnLines) + PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines) + PSP_SCREEN_SCALE_Y(3.0f);
 							const float bottom = top + barHeight;
 
+							sizeOfCounter = barWidth + PSP_SCREEN_SCALE_X(4.0f);
+
 							// shadow
-							CSprite2d::DrawRect(CRect(left + SCREEN_SCALE_X(6.0f), top + SCREEN_SCALE_Y(2.0f), right + SCREEN_SCALE_X(6.0f), bottom + SCREEN_SCALE_Y(2.0f)), CRGBA(0, 0, 0, 255));
+							CSprite2d::DrawRect(CRect(left - PSP_SCREEN_SCALE_X(1.0f), top - PSP_SCREEN_SCALE_Y(1.0f), right + PSP_SCREEN_SCALE_X(1.0f), bottom + PSP_SCREEN_SCALE_Y(1.0f)), CRGBA(0, 0, 0, m_HudAlpha));
 							
-							CSprite2d::DrawRect(CRect(left + SCREEN_SCALE_X(4.0f), top, right + SCREEN_SCALE_X(4.0f), bottom), CRGBA(27, 89, 130, 255));
-							CSprite2d::DrawRect(CRect(left + SCREEN_SCALE_X(4.0f), top, left + SCREEN_SCALE_X(counter) / 2.0f + SCREEN_SCALE_X(4.0f), bottom), CRGBA(97, 194, 247, 255));
+							CSprite2d::DrawRect(
+								CRect(left, top, right, bottom), 
+								CRGBA(
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour2.r,
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour2.g,
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour2.b,
+								m_HudAlpha));
+							CSprite2d::DrawRect(
+								CRect(left, top, left + counter / 100.0f * barWidth, bottom),
+								CRGBA(
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.r,
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.g,
+									CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.b,
+								m_HudAlpha));
 						}
 
-						if (CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText[0]) {
+						if (CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText1[0]) {
+							UseTimerCounterFontSettings();
 							CFont::SetPropOn();
-							CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-							CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-							CFont::SetDropShadowPosition(2);
-							CFont::SetDropColor(CRGBA(0, 0, 0, 255));
-							CFont::SetColor(COUNTER_COLOR);
-							CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(37.0f) - SCREEN_SCALE_X(61.0f), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y * 20.f * i) + SCREEN_SCALE_Y(132.0f), TheText.Get(CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText));
+							CFont::SetColor(CRGBA(
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.r,
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.g,
+								CUserDisplay::OnscnTimer.m_sCounters[i].m_colour1.b,
+								m_HudAlpha));
+							CFont::PrintString(PSP_SCREEN_SCALE_FROM_RIGHT(12.0f) - sizeOfCounter, PSP_SCREEN_SCALE_Y(100.0f) + PSP_SCREEN_SCALE_Y(20.f * nNumOnscrnLines) + PSP_SCREEN_SCALE_Y(31.0f * nNumBigOnscrnLines), TheText.Get(CUserDisplay::OnscnTimer.m_sCounters[i].m_aCounterText1));
 						}
-						// unused/leftover color. I wonder what was it for
-						CFont::SetColor(CRGBA(244, 225, 91, 255));
+						nNumOnscrnLines++;
 					}
 				}
 			}
@@ -2268,4 +2307,18 @@ CHud::ResetWastedText(void)
 	BigMessageInUse[0] = 0.0f;
 	m_BigMessage[2][0] = 0;
 	m_BigMessage[0][0] = 0;
+}
+
+void
+CHud::UseTimerCounterFontSettings()
+{
+	CFont::SetScale(PSP_SCREEN_SCALE_X(0.4048f), PSP_SCREEN_SCALE_Y(0.88f));
+	CFont::SetFontStyle(FONT_STANDARD);
+	CFont::SetCentreOff();
+	CFont::SetRightJustifyOn();
+	CFont::SetRightJustifyWrap(0.0f);
+	CFont::SetDropShadowPosition(0);
+	CFont::SetDropColor(CRGBA(0, 0, 0, 0));
+	CFont::SetBackgroundOff();
+	CFont::SetBackGroundOnlyTextOff();
 }
\ No newline at end of file
diff --git a/src/renderer/Hud.h b/src/renderer/Hud.h
index a5ad4f78..8a5dc9c6 100644
--- a/src/renderer/Hud.h
+++ b/src/renderer/Hud.h
@@ -151,4 +151,6 @@ public:
 	static void DrawTimeAndCashNumbers(char *str, float x, float y, bool secondSet);
 	static void DrawCash();
 	static void DrawTime();
+
+	static void UseTimerCounterFontSettings();
 };