pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 22:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some syntax adjustments to eqtime.cpp [skip ci]

Browse Source
This commit is contained in:
Akkadius 2015-05-25 23:57:48 -05:00
parent b6091c1960
commit 5c194c7087
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
common/eqtime.cpp
View File

@ -43,17 +43,17 @@ EQTime::EQTime(TimeOfDay_Struct start_eq, time_t start_real)
EQTime::EQTime() EQTime::EQTime()
{ {
timezone=0; timezone = 0;
memset(&eqTime, 0, sizeof(eqTime)); memset(&eqTime, 0, sizeof(eqTime));
//Defaults for time //Defaults for time
TimeOfDay_Struct start; TimeOfDay_Struct start;
start.day=1; start.day = 1;
start.hour=9; start.hour = 9;
start.minute=0; start.minute = 0;
start.month=1; start.month = 1;
start.year=3100; start.year = 3100;
//Set default time zone //Set default time zone
timezone=0; timezone = 0;
//Start EQTimer //Start EQTimer
SetCurrentEQTimeOfDay(start, time(0)); SetCurrentEQTimeOfDay(start, time(0));
} }
@ -67,10 +67,10 @@ EQTime::~EQTime()
//Input: Current Time (as a time_t), a pointer to the TimeOfDay_Struct that will be written to. //Input: Current Time (as a time_t), a pointer to the TimeOfDay_Struct that will be written to.
//Output: 0=Error, 1=Sucess //Output: 0=Error, 1=Sucess
int EQTime::GetCurrentEQTimeOfDay( time_t timeConvert, struct TimeOfDay_Struct *eqTimeOfDay ) int EQTime::GetCurrentEQTimeOfDay(time_t timeConvert, struct TimeOfDay_Struct *eqTimeOfDay)
{ {
/* check to see if we have a reference time to go by. */ /* check to see if we have a reference time to go by. */
if( eqTime.start_realtime == 0 ) if (eqTime.start_realtime == 0)
return 0; return 0;
unsigned long diff = timeConvert - eqTime.start_realtime; unsigned long diff = timeConvert - eqTime.start_realtime;
@ -83,7 +83,7 @@ int EQTime::GetCurrentEQTimeOfDay( time_t timeConvert, struct TimeOfDay_Struct *
int32 ntz = timezone; int32 ntz = timezone;
/* The minutes range from 0 - 59 */ /* The minutes range from 0 - 59 */
diff += eqTime.start_eqtime.minute + (ntz%60); diff += eqTime.start_eqtime.minute + (ntz % 60);
eqTimeOfDay->minute = diff % 60; eqTimeOfDay->minute = diff % 60;
diff /= 60; diff /= 60;
ntz /= 60; ntz /= 60;
@ -97,24 +97,24 @@ int EQTime::GetCurrentEQTimeOfDay( time_t timeConvert, struct TimeOfDay_Struct *
// //
// Modify it so that it works from // Modify it so that it works from
// 0-23 for our calculations // 0-23 for our calculations
diff += ( eqTime.start_eqtime.hour - 1) + (ntz%24); diff += (eqTime.start_eqtime.hour - 1) + (ntz % 24);
eqTimeOfDay->hour = (diff%24) + 1; eqTimeOfDay->hour = (diff % 24) + 1;
diff /= 24; diff /= 24;
ntz /= 24; ntz /= 24;
// The days range from 1-28 // The days range from 1-28
// Modify it so that it works from // Modify it so that it works from
// 0-27 for our calculations // 0-27 for our calculations
diff += ( eqTime.start_eqtime.day - 1 ) + (ntz%28); diff += (eqTime.start_eqtime.day - 1) + (ntz % 28);
eqTimeOfDay->day = (diff%28) + 1; eqTimeOfDay->day = (diff % 28) + 1;
diff /= 28; diff /= 28;
ntz /= 28; ntz /= 28;
// The months range from 1-12 // The months range from 1-12
// Modify it so that it works from // Modify it so that it works from
// 0-11 for our calculations // 0-11 for our calculations
diff += ( eqTime.start_eqtime.month - 1 ) + (ntz%12); diff += (eqTime.start_eqtime.month - 1) + (ntz % 12);
eqTimeOfDay->month = (diff%12) + 1; eqTimeOfDay->month = (diff % 12) + 1;
diff /= 12; diff /= 12;
ntz /= 12; ntz /= 12;
@ -126,10 +126,10 @@ int EQTime::GetCurrentEQTimeOfDay( time_t timeConvert, struct TimeOfDay_Struct *
//setEQTimeOfDay //setEQTimeOfDay
int EQTime::SetCurrentEQTimeOfDay(TimeOfDay_Struct start_eq, time_t start_real) int EQTime::SetCurrentEQTimeOfDay(TimeOfDay_Struct start_eq, time_t start_real)
{ {
if(start_real==0) if (start_real == 0)
return 0; return 0;
eqTime.start_eqtime=start_eq; eqTime.start_eqtime = start_eq;
eqTime.start_realtime=start_real; eqTime.start_realtime = start_real;
return 1; return 1;
} }
@ -139,7 +139,7 @@ bool EQTime::saveFile(const char *filename)
{ {
std::ofstream of; std::ofstream of;
of.open(filename); of.open(filename);
if(!of) if (!of)
{ {
Log.Out(Logs::General, Logs::Error, "EQTime::saveFile failed: Unable to open file '%s'", filename); Log.Out(Logs::General, Logs::Error, "EQTime::saveFile failed: Unable to open file '%s'", filename);
return false; return false;
@ -200,24 +200,24 @@ bool EQTime::loadFile(const char *filename)
bool EQTime::IsTimeBefore(TimeOfDay_Struct *base, TimeOfDay_Struct *test) { bool EQTime::IsTimeBefore(TimeOfDay_Struct *base, TimeOfDay_Struct *test) {
if(base->year > test->year) if (base->year > test->year)
return(true); return(true);
if(base->year < test->year) if (base->year < test->year)
return(false); return(false);
//same years //same years
if(base->month > test->month) if (base->month > test->month)
return(true); return(true);
if(base->month < test->month) if (base->month < test->month)
return(false); return(false);
//same month //same month
if(base->day > test->day) if (base->day > test->day)
return(true); return(true);
if(base->day < test->day) if (base->day < test->day)
return(false); return(false);
//same day //same day
if(base->hour > test->hour) if (base->hour > test->hour)
return(true); return(true);
if(base->hour < test->hour) if (base->hour < test->hour)
return(false); return(false);
//same hour... //same hour...
return(base->minute > test->minute); return(base->minute > test->minute);
@ -230,7 +230,7 @@ void EQTime::AddMinutes(uint32 minutes, TimeOfDay_Struct *to) {
//minutes start at 0, everything else starts at 1 //minutes start at 0, everything else starts at 1
cur = to->minute; cur = to->minute;
cur += minutes; cur += minutes;
if(cur < 60) { if (cur < 60) {
to->minute = cur; to->minute = cur;
return; return;
} }
@ -238,29 +238,29 @@ void EQTime::AddMinutes(uint32 minutes, TimeOfDay_Struct *to) {
//carry hours //carry hours
cur /= 60; cur /= 60;
cur += to->hour; cur += to->hour;
if(cur <= 24) { if (cur <= 24) {
to->hour = cur; to->hour = cur;
return; return;
} }
to->hour = ((cur-1) % 24) + 1; to->hour = ((cur - 1) % 24) + 1;
//carry days //carry days
cur = (cur-1) / 24; cur = (cur - 1) / 24;
cur += to->day; cur += to->day;
if(cur <= 28) { if (cur <= 28) {
to->day = cur; to->day = cur;
return; return;
} }
to->day = ((cur-1) % 28) + 1; to->day = ((cur - 1) % 28) + 1;
//carry months //carry months
cur = (cur-1) / 28; cur = (cur - 1) / 28;
cur += to->month; cur += to->month;
if(cur <= 12) { if (cur <= 12) {
to->month = cur; to->month = cur;
return; return;
} }
to->month = ((cur-1) % 12) + 1; to->month = ((cur - 1) % 12) + 1;
//carry years //carry years
to->year += (cur-1) / 12; to->year += (cur - 1) / 12;
} }
void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) { void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
@ -269,5 +269,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
t->month, t->day, t->year, t->hour, t->minute); t->month, t->day, t->year, t->hour, t->minute);
buf[127] = '\0'; buf[127] = '\0';
str = buf; str = buf;
} }