pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-18 08:18:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove trailing whitespace

Browse Source
This commit is contained in:
j883376
2013-05-06 13:07:41 -04:00
parent 7a93966158
commit ffcff4aea1
548 changed files with 16397 additions and 16398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/timer.cpp
+9 -9
View File
@@ -76,9 +76,9 @@ int gettimeofday (timeval *tp, ...)
bool Timer::Check(bool iReset)
{
_CP(Timer_Check);
if (this==0) {
cerr << "Null timer during ->Check()!?\n";
return true;
if (this==0) {
cerr << "Null timer during ->Check()!?\n";
return true;
}
// if (!current_time || !start_time || !timer_time) {cerr << "Timer::Check on a timer that does not have a vital member defined.";
// return true;}
@@ -92,7 +92,7 @@ bool Timer::Check(bool iReset)
}
return true;
}
return false;
}
@@ -106,11 +106,11 @@ void Timer::Enable() {
}
/* This function set the timer and restart it */
void Timer::Start(uint32 set_timer_time, bool ChangeResetTimer) {
void Timer::Start(uint32 set_timer_time, bool ChangeResetTimer) {
start_time = current_time;
enabled = true;
if (set_timer_time != 0)
{
{
timer_time = set_timer_time;
if (ChangeResetTimer)
set_at_trigger = set_timer_time;
@@ -158,7 +158,7 @@ void Timer::Trigger()
}
const uint32 Timer::GetCurrentTime()
{
{
return current_time;
}
@@ -172,7 +172,7 @@ const uint32 Timer::GetTimeSeconds() {
const uint32 Timer::SetCurrentTime()
{
struct timeval read_time;
struct timeval read_time;
uint32 this_time;
gettimeofday(&read_time,0);
@@ -186,7 +186,7 @@ const uint32 Timer::SetCurrentTime()
{
current_time += this_time - last_time;
}
last_time = this_time;
// cerr << "Current time:" << current_time << endl;