mirror of
https://github.com/Rosalie241/RMG.git
synced 2026-11-18 03:34:03 +01:00
RMG-Core: apply core settings & game core settings
This commit is contained in:
1 parent
c7e7a3f5f2
commit
aea147bf20
3 files changed
+80
-6
No files matched your search
@@ -7,8 +7,10 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "Emulation.hpp"
|
||||
#include "Settings/Settings.hpp"
|
||||
#include "MediaLoader.hpp"
|
||||
#include "RomSettings.hpp"
|
||||
#include "Emulation.hpp"
|
||||
#include "m64p/Api.hpp"
|
||||
#include "Plugins.hpp"
|
||||
#include "Error.hpp"
|
||||
@@ -34,6 +36,45 @@ static bool get_emulation_state(m64p_emu_state* state)
|
||||
return ret == M64ERR_SUCCESS;
|
||||
}
|
||||
|
||||
static void apply_coresettings_overlay(void)
|
||||
{
|
||||
CoreSettingsSetValue(SettingsID::Core_RandomizeInterrupt, CoreSettingsGetBoolValue(SettingsID::CoreOverlay_RandomizeInterrupt));
|
||||
CoreSettingsSetValue(SettingsID::Core_CPU_Emulator, CoreSettingsGetIntValue(SettingsID::CoreOverlay_CPU_Emulator));
|
||||
CoreSettingsSetValue(SettingsID::Core_DisableExtraMem, CoreSettingsGetBoolValue(SettingsID::CoreOverlay_DisableExtraMem));
|
||||
CoreSettingsSetValue(SettingsID::Core_EnableDebugger, CoreSettingsGetBoolValue(SettingsID::CoreOverlay_EnableDebugger));
|
||||
CoreSettingsSetValue(SettingsID::Core_CountPerOp, CoreSettingsGetIntValue(SettingsID::CoreOverlay_CountPerOp));
|
||||
CoreSettingsSetValue(SettingsID::Core_SiDmaDuration, CoreSettingsGetIntValue(SettingsID::CoreOverlay_SiDmaDuration));
|
||||
}
|
||||
|
||||
static void apply_game_coresettings_overlay(void)
|
||||
{
|
||||
std::string section;
|
||||
CoreRomSettings romSettings;
|
||||
bool overrideCoreSettings;
|
||||
|
||||
// when we fail to retrieve the rom settings, return
|
||||
if (!CoreGetCurrentDefaultRomSettings(romSettings))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
section = romSettings.MD5;
|
||||
|
||||
// when we don't need to override the core settings, return
|
||||
overrideCoreSettings = CoreSettingsGetBoolValue(SettingsID::Game_OverrideCoreSettings, section);
|
||||
if (!overrideCoreSettings)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// apply settings overlay
|
||||
CoreSettingsSetValue(SettingsID::Core_RandomizeInterrupt, CoreSettingsGetBoolValue(SettingsID::Game_RandomizeInterrupt, section));
|
||||
CoreSettingsSetValue(SettingsID::Core_CPU_Emulator, CoreSettingsGetIntValue(SettingsID::Game_CPU_Emulator, section));
|
||||
CoreSettingsSetValue(SettingsID::Core_DisableExtraMem, CoreSettingsGetBoolValue(SettingsID::Game_DisableExtraMem, section));
|
||||
CoreSettingsSetValue(SettingsID::Core_CountPerOp, CoreSettingsGetIntValue(SettingsID::Game_CountPerOp, section));
|
||||
CoreSettingsSetValue(SettingsID::Core_SiDmaDuration, CoreSettingsGetIntValue(SettingsID::Game_SiDmaDuration, section));
|
||||
}
|
||||
|
||||
//
|
||||
// Exported Functions
|
||||
//
|
||||
@@ -72,6 +113,12 @@ bool CoreStartEmulation(std::string n64rom, std::string n64ddrom)
|
||||
// set disk file in media loader
|
||||
CoreMediaLoaderSetDiskFile(n64ddrom);
|
||||
|
||||
// apply core settings overlay
|
||||
apply_coresettings_overlay();
|
||||
|
||||
// apply game core settings overrides
|
||||
apply_game_coresettings_overlay();
|
||||
|
||||
ret = m64p::Core.DoCommand(M64CMD_EXECUTE, 0, nullptr);
|
||||
if (ret != M64ERR_SUCCESS)
|
||||
{
|
||||
|
||||
@@ -201,21 +201,40 @@ static l_Setting get_setting(SettingsID settingId)
|
||||
break;
|
||||
|
||||
case SettingsID::Core_RandomizeInterrupt:
|
||||
setting = {SETTING_SECTION_OVERLAY, "RandomizeInterrupt", true};
|
||||
setting = {SETTING_SECTION_M64P, "RandomizeInterrupt", true};
|
||||
break;
|
||||
case SettingsID::Core_CPU_Emulator:
|
||||
setting = {SETTING_SECTION_OVERLAY, "CPU_Emulator", 2};
|
||||
setting = {SETTING_SECTION_M64P, "R4300Emulator", 2};
|
||||
break;
|
||||
case SettingsID::Core_DisableExtraMem:
|
||||
setting = {SETTING_SECTION_OVERLAY, "DisableExtraMem", false};
|
||||
setting = {SETTING_SECTION_M64P, "DisableExtraMem", false};
|
||||
break;
|
||||
case SettingsID::Core_EnableDebugger:
|
||||
setting = {SETTING_SECTION_OVERLAY, "EnableDebugger", false};
|
||||
setting = {SETTING_SECTION_M64P, "EnableDebugger", false};
|
||||
break;
|
||||
case SettingsID::Core_CountPerOp:
|
||||
setting = {SETTING_SECTION_OVERLAY, "CountPerOp", 0};
|
||||
setting = {SETTING_SECTION_M64P, "CountPerOp", 0};
|
||||
break;
|
||||
case SettingsID::Core_SiDmaDuration:
|
||||
setting = {SETTING_SECTION_M64P, "SiDmaDuration", -1};
|
||||
break;
|
||||
|
||||
case SettingsID::CoreOverlay_RandomizeInterrupt:
|
||||
setting = {SETTING_SECTION_OVERLAY, "RandomizeInterrupt", true};
|
||||
break;
|
||||
case SettingsID::CoreOverlay_CPU_Emulator:
|
||||
setting = {SETTING_SECTION_OVERLAY, "CPU_Emulator", 2};
|
||||
break;
|
||||
case SettingsID::CoreOverlay_DisableExtraMem:
|
||||
setting = {SETTING_SECTION_OVERLAY, "DisableExtraMem", false};
|
||||
break;
|
||||
case SettingsID::CoreOverlay_EnableDebugger:
|
||||
setting = {SETTING_SECTION_OVERLAY, "EnableDebugger", false};
|
||||
break;
|
||||
case SettingsID::CoreOverlay_CountPerOp:
|
||||
setting = {SETTING_SECTION_OVERLAY, "CountPerOp", 0};
|
||||
break;
|
||||
case SettingsID::CoreOverlay_SiDmaDuration:
|
||||
setting = {SETTING_SECTION_OVERLAY, "SiDmaDuration", -1};
|
||||
break;
|
||||
|
||||
|
||||
@@ -38,6 +38,14 @@ enum class SettingsID
|
||||
Core_CountPerOp,
|
||||
Core_SiDmaDuration,
|
||||
|
||||
// (mupen64plus) Overlay Core Settings
|
||||
CoreOverlay_RandomizeInterrupt,
|
||||
CoreOverlay_CPU_Emulator,
|
||||
CoreOverlay_DisableExtraMem,
|
||||
CoreOverlay_EnableDebugger,
|
||||
CoreOverlay_CountPerOp,
|
||||
CoreOverlay_SiDmaDuration,
|
||||
|
||||
// (mupen64plus) Core Directory Settings
|
||||
Core_ScreenshotPath,
|
||||
Core_SaveStatePath,
|
||||
|
||||
Reference in new issue
Block a user