Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate SConfig::bWii to System.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2024-01-31 12:54:07 +01:00
parent 8d515d407c
commit 9a3e770c23
40 changed files with 110 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp
+1 -2
View File
@@ -19,7 +19,6 @@
#include "Common/StringUtil.h"
#include "Core/CheatSearch.h"
#include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/MMU.h"
@@ -170,7 +169,7 @@ void CheatSearchFactoryWidget::OnNewSearchClicked()
auto& system = Core::System::GetInstance();
auto& memory = system.GetMemory();
memory_ranges.emplace_back(0x80000000, memory.GetRamSizeReal());
if (SConfig::GetInstance().bWii)
if (system.IsWii())
memory_ranges.emplace_back(0x90000000, memory.GetExRamSizeReal());
address_space = PowerPC::RequestedAddressSpace::Virtual;
}
Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
+2 -1
View File
@@ -28,6 +28,7 @@
#include "Core/IOS/IOS.h"
#include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/NetPlayProto.h"
#include "Core/System.h"
#include "Core/WiiUtils.h"
#include "DolphinQt/Config/Mapping/MappingWindow.h"
@@ -295,7 +296,7 @@ void WiimoteControllersWidget::LoadSettings(Core::State state)
m_wiimote_emu->setEnabled(!running);
m_wiimote_passthrough->setEnabled(!running);
const bool running_gc = running && !SConfig::GetInstance().bWii;
const bool running_gc = running && !Core::System::GetInstance().IsWii();
const bool enable_passthrough = m_wiimote_passthrough->isChecked() && !running_gc;
const bool enable_emu_bt = !m_wiimote_passthrough->isChecked() && !running_gc;
const bool is_netplay = NetPlay::IsNetPlayRunning();
Source/Core/DolphinQt/GameList/GameList.cpp
+1 -2
View File
@@ -46,7 +46,6 @@
#include "Common/FileUtil.h"
#include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/EXI/EXI.h"
@@ -437,7 +436,7 @@ void GameList::ShowContextMenu(const QPoint&)
// system menu, trigger a refresh.
Settings::Instance().NANDRefresh();
});
perform_disc_update->setEnabled(!Core::IsRunning() || !SConfig::GetInstance().bWii);
perform_disc_update->setEnabled(!Core::IsRunning() || !Core::System::GetInstance().IsWii());
}
if (!is_mod_descriptor && platform == DiscIO::Platform::WiiWAD)
Source/Core/DolphinQt/HotkeyScheduler.cpp
+1 -2
View File
@@ -23,7 +23,6 @@
#include "Core/Config/GraphicsSettings.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/UISettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/FreeLookManager.h"
#include "Core/Host.h"
@@ -266,7 +265,7 @@ void HotkeyScheduler::Run()
// TODO: HK_MBP_ADD
if (SConfig::GetInstance().bWii)
if (Core::System::GetInstance().IsWii())
{
int wiimote_id = -1;
if (IsHotkey(HK_WIIMOTE1_CONNECT))
Source/Core/DolphinQt/MainWindow.cpp
+1 -2
View File
@@ -46,7 +46,6 @@
#include "Core/Config/MainSettings.h"
#include "Core/Config/NetplaySettings.h"
#include "Core/Config/WiimoteSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/FreeLookManager.h"
#include "Core/HW/DVD/DVDInterface.h"
@@ -1970,7 +1969,7 @@ void MainWindow::ShowTASInput()
for (int i = 0; i < num_wii_controllers; i++)
{
if (Config::Get(Config::GetInfoForWiimoteSource(i)) == WiimoteSource::Emulated &&
(!Core::IsRunning() || SConfig::GetInstance().bWii))
(!Core::IsRunning() || Core::System::GetInstance().IsWii()))
{
SetQWidgetWindowDecorations(m_wii_tas_input_windows[i]);
m_wii_tas_input_windows[i]->show();