diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
| commit | 12181c8a64678e73281e893b6ba108d5a125c1aa (patch) | |
| tree | 831883189eb5c846b619c20e22e1015c5c140c63 /src/core/core_timing.cpp | |
| parent | 29a9e4ac25504bee82f273184a1afcc88a3e61e1 (diff) | |
| parent | 8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (diff) | |
Merge pull request #529 from Subv/master
Build: Fixed some warnings
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 12ea3ff19d..6048751607 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -459,7 +459,7 @@ void MoveEvents() { } void ForceCheck() { - int cycles_executed = g_slice_length - Core::g_app_core->down_count; + s64 cycles_executed = g_slice_length - Core::g_app_core->down_count; global_timer += cycles_executed; // This will cause us to check for new events immediately. Core::g_app_core->down_count = 0; @@ -468,7 +468,7 @@ void ForceCheck() { } void Advance() { - int cycles_executed = g_slice_length - Core::g_app_core->down_count; + s64 cycles_executed = g_slice_length - Core::g_app_core->down_count; global_timer += cycles_executed; Core::g_app_core->down_count = g_slice_length; @@ -504,13 +504,13 @@ void LogPendingEvents() { } void Idle(int max_idle) { - int cycles_down = Core::g_app_core->down_count; + s64 cycles_down = Core::g_app_core->down_count; if (max_idle != 0 && cycles_down > max_idle) cycles_down = max_idle; if (first && cycles_down > 0) { - int cycles_executed = g_slice_length - Core::g_app_core->down_count; - int cycles_next_event = (int)(first->time - global_timer); + s64 cycles_executed = g_slice_length - Core::g_app_core->down_count; + s64 cycles_next_event = first->time - global_timer; if (cycles_next_event < cycles_executed + cycles_down) { cycles_down = cycles_next_event - cycles_executed; |