diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-01 08:21:29 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-01 08:21:29 -0400 |
| commit | 5e3536f66f5ea1a3e96112ab83b41bb2b1c55f8f (patch) | |
| tree | 1d359c29f40c6f816a8a5e4852c074c0c698d93a /src | |
| parent | f05ae742a48c8aa2c353507675aac51af2ccec0d (diff) | |
| parent | 18c1c39d5e3c096fdcfafa38487f735501c543fb (diff) | |
Merge pull request #1072 from yuriks/GetSystemTick-advance-time
SVC: Advance time when calling GetSystemTick to escape busy-wait loops
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/svc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 19f750d72..45d5f3c5d 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -755,7 +755,10 @@ static void SleepThread(s64 nanoseconds) { /// This returns the total CPU ticks elapsed since the CPU was powered-on static s64 GetSystemTick() { - return (s64)CoreTiming::GetTicks(); + s64 result = CoreTiming::GetTicks(); + // Advance time to defeat dumb games (like Cubic Ninja) that busy-wait for the frame to end. + Core::g_app_core->AddTicks(150); // Measured time between two calls on a 9.2 o3DS with Ninjhax 1.1b + return result; } /// Creates a memory block at the specified address with the specified permissions and size |