From 75bca8e31eef877cc6df83146c665f86ad6f8583 Mon Sep 17 00:00:00 2001
From: Fire-Head <Fire-Head@users.noreply.github.com>
Date: Thu, 13 Jun 2019 03:35:26 +0300
Subject: CPad done

---
 src/Clock.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'src/Clock.cpp')

diff --git a/src/Clock.cpp b/src/Clock.cpp
index bd4126f2..dd7b99fe 100644
--- a/src/Clock.cpp
+++ b/src/Clock.cpp
@@ -3,6 +3,10 @@
 #include "Timer.h"
 #include "Pad.h"
 #include "Clock.h"
+#include "Stats.h"
+
+_TODO("gbFastTime");
+Bool &gbFastTime = *(Bool*)0x95CDBB;
 
 uint8  &CClock::ms_nGameClockHours = *(uint8*)0x95CDA6;
 uint8  &CClock::ms_nGameClockMinutes = *(uint8*)0x95CDC8;
@@ -30,26 +34,37 @@ CClock::Initialise(uint32 scale)
 void
 CClock::Update(void)
 {
-	if(CPad::GetPad(1)->GetRightShoulder1()){
+	if(CPad::GetPad(1)->GetRightShoulder1())
+	{
 		ms_nGameClockMinutes += 8;
 		ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
-		if(ms_nGameClockMinutes >= 60){
+		
+		if(ms_nGameClockMinutes >= 60)
+		{
 			ms_nGameClockHours++;
 			ms_nGameClockMinutes = 0;
 			if(ms_nGameClockHours >= 24)
 				ms_nGameClockHours = 0;
 		}
-	}else
-	if(CTimer::GetTimeInMilliseconds() - ms_nLastClockTick >
-	   ms_nMillisecondsPerGameMinute){
+		
+	}
+	else if(CTimer::GetTimeInMilliseconds() - ms_nLastClockTick > ms_nMillisecondsPerGameMinute || gbFastTime)
+	{
 		ms_nGameClockMinutes++;
 		ms_nLastClockTick += ms_nMillisecondsPerGameMinute;
-		if(ms_nGameClockMinutes >= 60){
+		
+		if ( gbFastTime )
+			ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+		
+		if(ms_nGameClockMinutes >= 60)
+		{
 			ms_nGameClockHours++;
 			ms_nGameClockMinutes = 0;
 			if(ms_nGameClockHours >= 24)
+			{
+				CStats::DaysPassed++;
 				ms_nGameClockHours = 0;
-				// TODO: stats days passed
+			}
 		}
 	}
 	ms_nGameClockSeconds +=
-- 
cgit v1.2.3