From 739faac2648199890b1f8763952b70d4de918109 Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 9 Nov 2015 12:55:30 +0530 Subject: [PATCH] EE: Invert the slider values logic --- pcsx2/gui/AppConfig.cpp | 4 ++-- pcsx2/gui/Panels/SpeedhacksPanel.cpp | 13 ++++++------- pcsx2/x86/ix86-32/iR5900-32.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index bbd8ec6ee8..7ded687ebd 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -1048,7 +1048,7 @@ bool AppConfig::IsOkApplyPreset(int n) vuUsed?0:(vuUsed=true, EmuOptions.Speedhacks.VUCycleSteal = 2); case 4 : //set EE cyclerate to 2 clicks (maximum) - eeUsed?0:(eeUsed=true, EmuOptions.Speedhacks.EECycleRate = 2); + eeUsed?0:(eeUsed=true, EmuOptions.Speedhacks.EECycleRate = -2); case 3 : //Set VU cycle steal to 1 click, set VU clamp mode to 'none' vuUsed?0:(vuUsed=true, EmuOptions.Speedhacks.VUCycleSteal = 1); @@ -1058,7 +1058,7 @@ bool AppConfig::IsOkApplyPreset(int n) //best balanced hacks combo? case 2 : //set EE cyclerate to 1 click. - eeUsed?0:(eeUsed=true, EmuOptions.Speedhacks.EECycleRate = 1); + eeUsed?0:(eeUsed=true, EmuOptions.Speedhacks.EECycleRate = -1); // EE timing hack appears to break the BIOS text and cause slowdowns in a few titles. //EnableGameFixes = true; //EmuOptions.Gamefixes.EETimingHack = true; diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index 2975967b58..61c1f3ad47 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -24,25 +24,24 @@ const wxChar* Panels::SpeedHacksPanel::GetEEcycleSliderMsg( int val ) switch( val ) { case -2: - return pxEt( L"-2 - Increases the EE's cyclerate by about 50%. Greatly increases hardware requirements, may noticeably increase in-game FPS.\nThis setting can cause games to FAIL TO BOOT." + return pxEt(L"-2 - Reduces the EE's cyclerate by about 50%. Moderate speedup, but *will* cause stuttering audio on many FMVs." ); case -1: - return pxEt( L"-1 - Increases the EE's cyclerate by about 33%. Increases hardware requirements, may increase in-game FPS." + return pxEt(L"-1 - Reduces the EE's cyclerate by about 33%. Mild speedup for most games with high compatibility." ); case 0: - return pxEt( L"0 - Default cyclerate. This closely matches the actual speed of a real PS2 EmotionEngine." + return pxEt(L"0 - Default cyclerate. This closely matches the actual speed of a real PS2 EmotionEngine." ); case 1: - return pxEt( L"1 - Reduces the EE's cyclerate by about 33%. Mild speedup for most games with high compatibility." + return pxEt( L"1 - Increases the EE's cyclerate by about 33%. Increases hardware requirements, may increase in-game FPS." ); case 2: - return pxEt( L"2 - Reduces the EE's cyclerate by about 50%. Moderate speedup, but *will* cause stuttering audio on many FMVs." + return pxEt(L"2 - Increases the EE's cyclerate by about 50%. Greatly increases hardware requirements, may noticeably increase in-game FPS.\nThis setting can cause games to FAIL TO BOOT." ); - default: break; } @@ -123,7 +122,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) m_msg_eecycle->SetForegroundColour( wxColour( L"Red" ) ); m_msg_eecycle->SetHeight(5); - const wxChar* ee_tooltip = pxEt( L"Setting higher values on this slider effectively reduces the clock speed of the EmotionEngine's R5900 core cpu, and typically brings big speedups to games that fail to utilize the full potential of the real PS2 hardware. Conversely, lower values effectively increase the clock speed which may bring about an increase in in-game FPS while also making games more demanding and possibly causing glitches." + const wxChar* ee_tooltip = pxEt( L"Setting lower values on this slider effectively reduces the clock speed of the EmotionEngine's R5900 core cpu, and typically brings big speedups to games that fail to utilize the full potential of the real PS2 hardware. Conversely, higher values effectively increase the clock speed which may bring about an increase in in-game FPS while also making games more demanding and possibly causing glitches." ); pxSetToolTip( m_slider_eecycle, ee_tooltip ); diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 150fe391c0..a67ed4b087 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -1122,11 +1122,11 @@ static u32 scaleblockcycles() if (cyclerate == 0 || lowcycles || cyclerate > 99 || cyclerate < -2) scale_cycles = s_nBlockCycles >> 3; // Default cycle rate - else if (cyclerate < 0) - scale_cycles = s_nBlockCycles >> (3 - cyclerate); - else if (cyclerate > 0) - scale_cycles = ((5 + (2 * cyclerate)) * s_nBlockCycles) >> 5; + scale_cycles = s_nBlockCycles >> (3 + cyclerate); + + else if (cyclerate < 0) + scale_cycles = ((5 + (-2 * cyclerate)) * s_nBlockCycles) >> 5; // Ensure block cycle count is never less than 1. return (scale_cycles < 1) ? 1 : scale_cycles;