diff options
| author |  Yuri Kunde Schlesner | 2016-07-23 04:38:16 -0700 |
|---|---|---|
| committer |  GitHub | 2016-07-23 04:38:16 -0700 |
| commit | 2dee47c8277484f0fdc486ec201ed5c25d7b73a3 (patch) | |
| tree | 60611fb27fc92610176216a8f947cf5bd82d9b63 /src/core/core_timing.h | |
| parent | Merge pull request #1964 from Lectem/sdl2_dll_copy_fix (diff) | |
| parent | CoreTiming: avoid overflow (diff) | |
| download | yuzu-2dee47c8277484f0fdc486ec201ed5c25d7b73a3.tar.gz yuzu-2dee47c8277484f0fdc486ec201ed5c25d7b73a3.tar.xz yuzu-2dee47c8277484f0fdc486ec201ed5c25d7b73a3.zip | |
Merge pull request #1963 from wwylele/rtc
Implement actual system time
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 64f5b06d9..3d8a7d0c0 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | extern int g_clock_rate_arm11; | 26 | extern int g_clock_rate_arm11; |
| 27 | 27 | ||
| 28 | inline s64 msToCycles(int ms) { | 28 | inline s64 msToCycles(int ms) { |
| 29 | return g_clock_rate_arm11 / 1000 * ms; | 29 | return (s64)g_clock_rate_arm11 / 1000 * ms; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | inline s64 msToCycles(float ms) { | 32 | inline s64 msToCycles(float ms) { |