diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 08:26:51 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 08:26:51 +0200 |
| commit | e2dfa603a01a1ebb9b09e466bec6ff68f274eae6 (patch) | |
| tree | b5a1d3174558850a5c4fd4e667a6039001d66c5b | |
| parent | 51a5311d6a572764b75457cc4003e39cccb8c13e (diff) | |
| parent | a3cfc98f26aae103136159f6a157d3c1d54a6e77 (diff) | |
Merge pull request #891 from RachelBryk/netplay-time
Allow system time to move forward during netplay.
| -rw-r--r-- | Source/Core/Core/HW/EXI_DeviceIPL.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index 38d0bf6b39..32a180123b 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -352,6 +352,8 @@ u32 CEXIIPL::GetGCTime() if (0 == ltime) ltime = Common::Timer::GetLocalTimeSinceJan1970(); + else + ltime += CoreTiming::GetTicks() / SystemTimers::GetTicksPerSecond(); } return ((u32)ltime - cJanuary2000); |