diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-13 09:49:35 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 09:49:35 +1300 |
| commit | 24f7ebc890a7aeebd2aa8b33fff64aa394f6930c (patch) | |
| tree | 4883480ee60b07f64fb17ad2c4e4156a70b88f0d /Source/Core | |
| parent | cc513783899f84dd7dcfaa037c7f100b1a67eccd (diff) | |
| parent | c5e731644c01ac7c3cfcc02945693aa7e60dd586 (diff) | |
Merge pull request #4420 from JosJuice/memcard-header-time
Don't use GetEmulatedTime in GCMemcard
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index 926c7ea9db..c609cc5dd7 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -11,6 +11,7 @@ #include "Common/CommonTypes.h" #include "Common/NandPaths.h" #include "Common/NonCopyable.h" +#include "Common/Timer.h" #include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/Sram.h" @@ -136,7 +137,7 @@ struct Header // Offset Size Description memset(this, 0xFF, BLOCK_SIZE); *(u16*)SizeMb = BE16(sizeMb); Encoding = BE16(shift_jis ? 1 : 0); - u64 rand = CEXIIPL::GetEmulatedTime(CEXIIPL::GC_EPOCH); + u64 rand = Common::Timer::GetLocalTimeSinceJan1970() - CEXIIPL::GC_EPOCH; formatTime = Common::swap64(rand); for (int i = 0; i < 12; i++) { |