thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-21 20:27:13 +01:00
Code Releases Activity

Don't use negative sum of seconds in the specified date range.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-07-04 16:36:41 +03:00
parent 87ab54d453
commit 82ddf372f3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Library/Chrono.cpp
View File

@ -225,18 +225,14 @@ Int64 Chrono::DateRangeToSeconds(Uint16 _year, Uint8 _month, Uint8 _day, Uint16
// Are we within the same year? // Are we within the same year?
if (_year == year_) if (_year == year_)
{ {
return (DayOfYear(_year, _month, _day) - DayOfYear(year_, month_, day_)) * 86400ULL; return std::abs((DayOfYear(_year, _month, _day) - DayOfYear(year_, month_, day_)) * 86400ULL);
} }
// Should we negate the result when returning it?
bool neg = false;
// Is the start year greater than the end year? // Is the start year greater than the end year?
if (_year > year_) else if (_year > year_)
{ {
std::swap(_year, year_); std::swap(_year, year_);
std::swap(_month, month_); std::swap(_month, month_);
std::swap(_day, day_); std::swap(_day, day_);
// Negate the result
neg = true;
} }
// Calculate the remaining days from the first year // Calculate the remaining days from the first year
Int64 num = DaysInYear(_year) - DayOfYear(_year, _month, _day); Int64 num = DaysInYear(_year) - DayOfYear(_year, _month, _day);
@ -250,7 +246,7 @@ Int64 Chrono::DateRangeToSeconds(Uint16 _year, Uint8 _month, Uint8 _day, Uint16
// Convert the obtained days in seconds // Convert the obtained days in seconds
num *= 86400ULL; num *= 86400ULL;
// Return the result // Return the result
return neg ? -num : num; return std::abs(num);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------