From c54cc3fa3815c30d18d06070d2273a7a82e20e9c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 31 Jan 2019 06:30:06 -0600 Subject: [PATCH] HW: SI_Device_GCController: Minor cleanup. Remove a member/state variable that should just be a local variable. --- Source/Core/Core/HW/SI/SI_DeviceGCController.cpp | 5 ++--- Source/Core/Core/HW/SI/SI_DeviceGCController.h | 1 - Source/Core/Core/State.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp index 7e6ee9bd3f..eb5a829721 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp @@ -252,8 +252,8 @@ CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status) if (m_last_button_combo != COMBO_NONE) { - m_timer_button_combo = CoreTiming::GetTicks(); - if ((m_timer_button_combo - m_timer_button_combo_start) > SystemTimers::GetTicksPerSecond() * 3) + const u64 current_time = CoreTiming::GetTicks(); + if (u32(current_time - m_timer_button_combo_start) > SystemTimers::GetTicksPerSecond() * 3) { if (m_last_button_combo == COMBO_RESET) { @@ -326,7 +326,6 @@ void CSIDevice_GCController::DoState(PointerWrap& p) p.Do(m_origin); p.Do(m_mode); p.Do(m_timer_button_combo_start); - p.Do(m_timer_button_combo); p.Do(m_last_button_combo); } diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.h b/Source/Core/Core/HW/SI/SI_DeviceGCController.h index b42f574613..217880c9cd 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCController.h +++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.h @@ -78,7 +78,6 @@ protected: // Technically, the above is only on standard pad, wavebird does not support it for example // b, x, start for 3 seconds triggers reset (PI reset button interrupt) u64 m_timer_button_combo_start = 0; - u64 m_timer_button_combo = 0; // Type of button combo from the last/current poll EButtonCombo m_last_button_combo = COMBO_NONE; diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 65416a5589..87d88d5e68 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 100; // Last changed in PR 7728 +static const u32 STATE_VERSION = 101; // Last changed in PR 7761 // Maps savestate versions to Dolphin versions. // Versions after 42 don't need to be added to this list,