Skip to content
Permalink
Browse files

Merge pull request #7761 from jordan-woyak/gccontroller-minor-cleanup

HW: SI_Device_GCController: Minor cleanup.
  • Loading branch information...
lioncash committed Feb 1, 2019
2 parents 4408a0c + c54cc3f commit e5ca338958b3c52517105f193b988afae34dcbff
@@ -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);
}

@@ -78,7 +78,6 @@ class CSIDevice_GCController : public ISIDevice
// 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;

@@ -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,

0 comments on commit e5ca338

Please sign in to comment.
You can’t perform that action at this time.