AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:04:56 +00:00
Code Issues Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Phillip Stephens
2019-09-09 04:21:01 -07:00
parent f07fc458d2
commit e2ab93dfac
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/markdown-navigator/profiles_settings.xml generated
View File

@@ -1,3 +0,0 @@
<component name="MarkdownNavigator.ProfileManager">
<settings default="" pdf-export="" plain-text-search-scope="Project Files" />
</component>

6
Runtime/CBasicsPC.cpp
View File

@@ -59,16 +59,14 @@ u64 CBasics::GetGCTicks() {
const u64 CBasics::SECONDS_TO_2000 = 946684800LL; const u64 CBasics::SECONDS_TO_2000 = 946684800LL;
const u64 CBasics::TICKS_PER_SECOND = 60750000LL; const u64 CBasics::TICKS_PER_SECOND = 60750000LL;
#ifndef _WIN32
static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOff) { static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOff) {
#ifndef _WIN32
auto ret = ::localtime_r(&time, &timeSt); auto ret = ::localtime_r(&time, &timeSt);
if (!ret) if (!ret)
return nullptr; return nullptr;
gmtOff = ret->tm_gmtoff; gmtOff = ret->tm_gmtoff;
return ret; return ret;
}
#else #else
static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOff) {
struct tm _gmSt; struct tm _gmSt;
auto reta = localtime_s(&timeSt, &time); auto reta = localtime_s(&timeSt, &time);
auto retb = gmtime_s(&_gmSt, &time); auto retb = gmtime_s(&_gmSt, &time);
@@ -76,8 +74,8 @@ static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOf
return nullptr; return nullptr;
gmtOff = mktime(&timeSt) - mktime(&_gmSt); gmtOff = mktime(&timeSt) - mktime(&_gmSt);
return &timeSt; return &timeSt;
}
#endif #endif
}
OSTime CBasics::ToWiiTime(std::chrono::system_clock::time_point time) { OSTime CBasics::ToWiiTime(std::chrono::system_clock::time_point time) {
auto sec = std::chrono::time_point_cast<std::chrono::seconds>(time); auto sec = std::chrono::time_point_cast<std::chrono::seconds>(time);

2
amuse

Submodule amuse updated: d88b14c38a...6c07ec907a

2
hecl

Submodule hecl updated: eaa8eebbd7...573e53d9a5

2
nod

Submodule nod updated: acdadaf963...ba0c2b7843

2
specter

Submodule specter updated: 2b9863cd47...5bf7a6076b