ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HW: SI_Device_GCController: Minor cleanup. Remove a member/state variable that should just be a local variable.

This commit is contained in:
Jordan Woyak 2019-01-31 06:30:06 -06:00
parent 419ba925b7
commit c54cc3fa38
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
View File

@ -252,8 +252,8 @@ CSIDevice_GCController::HandleButtonCombos(const GCPadStatus& pad_status)
if (m_last_button_combo != COMBO_NONE) if (m_last_button_combo != COMBO_NONE)
{ {
m_timer_button_combo = CoreTiming::GetTicks(); const u64 current_time = CoreTiming::GetTicks();
if ((m_timer_button_combo - m_timer_button_combo_start) > SystemTimers::GetTicksPerSecond() * 3) if (u32(current_time - m_timer_button_combo_start) > SystemTimers::GetTicksPerSecond() * 3)
{ {
if (m_last_button_combo == COMBO_RESET) if (m_last_button_combo == COMBO_RESET)
{ {
@ -326,7 +326,6 @@ void CSIDevice_GCController::DoState(PointerWrap& p)
p.Do(m_origin); p.Do(m_origin);
p.Do(m_mode); p.Do(m_mode);
p.Do(m_timer_button_combo_start); p.Do(m_timer_button_combo_start);
p.Do(m_timer_button_combo);
p.Do(m_last_button_combo); p.Do(m_last_button_combo);
} }

1
Source/Core/Core/HW/SI/SI_DeviceGCController.h
View File

@ -78,7 +78,6 @@ protected:
// Technically, the above is only on standard pad, wavebird does not support it for example // 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) // b, x, start for 3 seconds triggers reset (PI reset button interrupt)
u64 m_timer_button_combo_start = 0; u64 m_timer_button_combo_start = 0;
u64 m_timer_button_combo = 0;
// Type of button combo from the last/current poll // Type of button combo from the last/current poll
EButtonCombo m_last_button_combo = COMBO_NONE; EButtonCombo m_last_button_combo = COMBO_NONE;

2
Source/Core/Core/State.cpp
View File

@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // 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. // Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list, // Versions after 42 don't need to be added to this list,