preserve-emulation/RMG
1
0
Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-07-11 01:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

RMG: don't enforce same cpu_emulator because it gets synced

Browse Source
This commit is contained in:
Rosalie Wanders
2024-12-25 12:56:22 +01:00
parent a0369def10
commit 9602aa2ef7
4 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.cpp
-1
View File
@@ -297,7 +297,6 @@ void CreateNetplaySessionDialog::accept()
QList<QString> plugins = NetplayCommon::GetPluginNames(romData.MD5);
QJsonObject jsonFeatures;
jsonFeatures.insert("cpu_emulator", NetplayCommon::GetCpuEmulator(romData.MD5));
jsonFeatures.insert("rsp_plugin", plugins[0]);
jsonFeatures.insert("gfx_plugin", plugins[1]);
Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.cpp
-30
View File
@@ -32,36 +32,6 @@ void NetplayCommon::AddCommonJson(QJsonObject& json)
json.insert("netplay_version", 16);
}
QString NetplayCommon::GetCpuEmulator(QString md5QString)
{
const std::string md5 = md5QString.toStdString();
int cpuEmulator = -1;
bool overrideCoreSettings = CoreSettingsGetBoolValue(SettingsID::Game_OverrideCoreSettings, md5);
if (overrideCoreSettings)
{
cpuEmulator = CoreSettingsGetIntValue(SettingsID::Game_CPU_Emulator, md5);
}
else
{
cpuEmulator = CoreSettingsGetIntValue(SettingsID::CoreOverlay_CPU_Emulator);
}
return QString::number(cpuEmulator);
}
QString NetplayCommon::GetCpuEmulatorName(QString cpuEmulator)
{
switch (cpuEmulator.toInt())
{
default:
case 0:
return "Pure Interpreter";
case 1:
return "Cached Interpreter";
case 2:
return "Dynamic Recompiler";
}
}
QList<QString> NetplayCommon::GetPluginNames(QString md5QString)
{
QList<QString> pluginNames(2);
Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.hpp
-6
View File
@@ -22,12 +22,6 @@ namespace NetplayCommon
// Adds common json emulator and auth info
void AddCommonJson(QJsonObject& json);
// Retrieves CPU emulator for MD5
QString GetCpuEmulator(QString md5QString);
// Retrieves CPU emulator name
QString GetCpuEmulatorName(QString cpuEmulator);
// Retrieves RSP and GFX plugin names
QList<QString> GetPluginNames(QString md5QString);
}
Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp
-9
View File
@@ -400,16 +400,7 @@ void NetplaySessionBrowserDialog::accept()
// ensure features match to what we currently have
QList<QString> pluginNames = NetplayCommon::GetPluginNames(sessionData.MD5);
QString cpuEmulator = NetplayCommon::GetCpuEmulator(sessionData.MD5);
QString details;
if (sessionData.CpuEmulator != cpuEmulator)
{
details = "Expected CPU Emulator: " + NetplayCommon::GetCpuEmulatorName(sessionData.CpuEmulator) + "\n";
details += "Current CPU Emulator: " + NetplayCommon::GetCpuEmulatorName(cpuEmulator);
this->showErrorMessage("CPU Emulator Mismatch", details);
joinButton->setEnabled(true);
return;
}
if (sessionData.RspPlugin != pluginNames[0])
{
details = "Expected RSP Plugin: " + sessionData.RspPlugin + "\n";