diff options
| author |  bunnei | 2021-05-03 16:04:28 -0700 |
|---|---|---|
| committer |  GitHub | 2021-05-03 16:04:28 -0700 |
| commit | df51eb9bdec5be189e0662ab81bc29277f3da343 (patch) | |
| tree | dc1a5cf937fe77ccabb8dab97b5e9a5af9758c27 /src/core/core_timing.cpp | |
| parent | Merge pull request #6275 from german77/mousefocus (diff) | |
| parent | core: Resolve misc cases of variable shadowing (diff) | |
| download | yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.gz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.xz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.zip | |
Merge pull request #6278 from lioncash/misc-shadow
core: Resolve misc straggler cases of variable shadowing
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 874b5673a..c2f0f609f 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -133,8 +133,8 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, | |||
| 133 | } | 133 | } |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | void CoreTiming::AddTicks(u64 ticks) { | 136 | void CoreTiming::AddTicks(u64 ticks_to_add) { |
| 137 | this->ticks += ticks; | 137 | ticks += ticks_to_add; |
| 138 | downcount -= static_cast<s64>(ticks); | 138 | downcount -= static_cast<s64>(ticks); |
| 139 | } | 139 | } |
| 140 | 140 | ||