From 0deb9f5e39fee7b874264c9a9e72e556225e8a19 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 1 Apr 2015 22:26:45 +0200 Subject: [PATCH] Revert "Merge pull request #2256 from RachelBryk/Dolphin-Pro" This reverts commit ae0a09070114d5c7a9603d61c3f1b250e4d43749, reversing changes made to 6b6b5ed37fa2e7b3b9010e957b68fcf840671fd0. --- Source/Core/Core/ConfigManager.cpp | 6 ------ Source/Core/Core/ConfigManager.h | 2 -- Source/Core/Core/HW/Wiimote.cpp | 2 -- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 20 ------------------- Source/Core/DolphinWX/InputConfigDiag.cpp | 9 +-------- Source/Core/InputCommon/ControllerEmu.cpp | 1 + 6 files changed, 2 insertions(+), 38 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index aa7de0ab9c72..1afa82d1aa45 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -354,7 +354,6 @@ void SConfig::SaveCoreSettings(IniFile& ini) core->Set("GFXBackend", m_LocalCoreStartupParameter.m_strVideoBackend); core->Set("GPUDeterminismMode", m_LocalCoreStartupParameter.m_strGPUDeterminismMode); core->Set("GameCubeAdapter", m_GameCubeAdapter); - core->Set("DolphinPro", m_DolphinPro); } void SConfig::SaveMovieSettings(IniFile& ini) @@ -622,11 +621,6 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("GFXBackend", &m_LocalCoreStartupParameter.m_strVideoBackend, ""); core->Get("GPUDeterminismMode", &m_LocalCoreStartupParameter.m_strGPUDeterminismMode, "auto"); core->Get("GameCubeAdapter", &m_GameCubeAdapter, true); -#ifdef DOLPHINPRO - m_DolphinPro = true; -#else - core->Get("DolphinPro", &m_DolphinPro, false); -#endif } void SConfig::LoadMovieSettings(IniFile& ini) diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 2554519186a3..cac39cbb3154 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -119,8 +119,6 @@ struct SConfig : NonCopyable SysConf* m_SYSCONF; - bool m_DolphinPro; - // Save settings void SaveSettings(); diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index 28e086e50f1b..13797a118095 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -25,8 +25,6 @@ InputConfig* GetConfig() void Shutdown() { - s_config.SaveConfig(); - for (const ControllerEmu* i : s_config.controllers) { delete i; diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index c39aa9f18f2d..b16dbce96380 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -21,8 +21,6 @@ #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" #include "Core/HW/WiimoteEmu/Attachment/Turntable.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" namespace { @@ -304,7 +302,6 @@ Wiimote::Wiimote( const unsigned int index ) m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false)); m_options->settings.emplace_back(new ControlGroup::IterateUI(_trans("Iterative Input"))); m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Speaker Pan"), 0, -127, 127)); - m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Battery"), 95, 0, 255)); // TODO: This value should probably be re-read if SYSCONF gets changed m_sensor_bar_on_top = SConfig::GetInstance().m_SYSCONF->GetData("BT.BAR") != 0; @@ -639,23 +636,6 @@ void Wiimote::Update() if (Step()) return; - m_status.battery = (u8)(m_options->settings[5]->GetValue() * 100); - if (!m_status.battery) - { - GetUsbPointer()->AccessWiiMote(m_index | 0x100)->Activate(false); - return; - } - - static u32 batteryCounter = 0; - // drop battery by 1 every 144000 times input is polled. At 200 hz polling, this is once per 12 mins. Gives 19 hours - // of battery life from the default of 95, or 51 hours at the max of 255. - if (++batteryCounter > 144000) - { - m_status.battery--; - m_options->settings[5]->SetValue(((ControlState)m_status.battery) / 100); - batteryCounter = 0; - } - u8 data[MAX_PAYLOAD]; memset(data, 0, sizeof(data)); diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 7f060e73689f..4c3d70c99a45 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -946,14 +946,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin setting->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting); wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); - wxStaticText* nameBox = new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))); - if (groupSetting->name == "Battery" && !SConfig::GetInstance().m_DolphinPro) - { - setting->wxcontrol->Disable(); - nameBox->SetToolTip(wxGetTranslation("Upgrade to Dolphin Pro to recharge batteries.")); - } - - szr->Add(nameBox, 0, wxCENTER | wxRIGHT, 3); + szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))), 0, wxCENTER | wxRIGHT, 3); szr->Add(setting->wxcontrol, 0, wxRIGHT, 3); Add(szr, 0, wxALL | wxCENTER, 3); } diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 17e7a6d7cc6b..df82bc09708a 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -219,6 +219,7 @@ ControllerEmu::Cursor::Cursor(const std::string& _name) settings.emplace_back(new Setting(_trans("Center"), 0.5)); settings.emplace_back(new Setting(_trans("Width"), 0.5)); settings.emplace_back(new Setting(_trans("Height"), 0.5)); + } void ControllerEmu::LoadDefaults(const ControllerInterface &ciface)