Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CPad done

Browse Source
This commit is contained in:
Fire-Head
2019-06-13 03:35:26 +03:00
parent 292fd5ad24
commit 75bca8e31e
27 changed files with 2251 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Clock.cpp
View File

@@ -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 +=