summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-26 04:47:29 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-30 05:07:02 +0200
commit18c1c39d5e3c096fdcfafa38487f735501c543fb (patch)
treece81914258487068cd068091f8e85738b1142028 /src/core
parentMerge pull request #1048 from yuriks/microprofile (diff)
downloadyuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar.gz
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar.bz2
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar.lz
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar.xz
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.tar.zst
yuzu-18c1c39d5e3c096fdcfafa38487f735501c543fb.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/svc.cpp5
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