Skip to content

Update Timer.h #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
11EJDE11 wants to merge 1 commit into
base: phobos-dev
Choose a base branch
from
Open

Update Timer.h #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion Timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,20 @@ struct SystemTimer
operator long() const { return SystemTimer::GetTime(); }
};

struct MillisecondSystemTimer
{
static DWORD GetTime() JMP_STD(0x5D5890);
long operator()()const { return MillisecondSystemTimer::GetTime(); }
operator long() const { return MillisecondSystemTimer::GetTime(); }
};

template<TimerType Clock>
struct TimerStruct
{
int StartTime;
Clock CurrentTime;
int TimeLeft;

constexpr TimerStruct() :StartTime { -1 }, TimeLeft { 0 } { };
explicit TimerStruct(const noinit_t&){ }
explicit TimerStruct(int duration) { this->Start(duration); }
Expand Down Expand Up @@ -141,3 +148,18 @@ class RateTimer : public CDTimerClass
return rate ? static_cast<double>(rate - this->GetTimeLeft()) / static_cast<double>(rate) : 1.0;
}
};

// Used for both tick-based (campaign/skirmish) and millisecond-based (multiplayer) timing
struct BasicTimerStruct
{
DWORD StartTime;
DWORD CurrentTime;
int TimeLeft;
};

// Global game frame timers
namespace Unsorted
{
DEFINE_REFERENCE(BasicTimerStruct, NetworkFrameTimer, 0x887328);
DEFINE_REFERENCE(BasicTimerStruct, GameFrameTimer, 0x887348);
}