mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull in missed commits

Browse source
This commit is contained in:
r2dliu 2020-07-26 14:22:46 -04:00
commit d8f9a99136
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Common/FileUtil.cpp
View file

@ -876,6 +876,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP; s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD; s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD;
s_user_paths[F_USERJSON_IDX] = s_user_paths[D_USER_IDX] + "user.json";
s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP; s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] = s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =

1
Source/Core/Common/FileUtil.h
View file

@ -70,6 +70,7 @@ enum
F_MEMORYWATCHERLOCATIONS_IDX, F_MEMORYWATCHERLOCATIONS_IDX,
F_MEMORYWATCHERSOCKET_IDX, F_MEMORYWATCHERSOCKET_IDX,
F_WIISDCARD_IDX, F_WIISDCARD_IDX,
F_USERJSON_IDX,
F_DUALSHOCKUDPCLIENTCONFIG_IDX, F_DUALSHOCKUDPCLIENTCONFIG_IDX,
NUM_PATH_INDICES NUM_PATH_INDICES
}; };

18
Source/Core/Core/ConfigManager.cpp
View file

@ -422,10 +422,10 @@ void SConfig::LoadInterfaceSettings(IniFile& ini)
{ {
IniFile::Section* interface = ini.GetOrCreateSection("Interface"); IniFile::Section* interface = ini.GetOrCreateSection("Interface");
interface->Get("ConfirmStop", &bConfirmStop, true); interface->Get("ConfirmStop", &bConfirmStop, false);
interface->Get("UsePanicHandlers", &bUsePanicHandlers, true); interface->Get("UsePanicHandlers", &bUsePanicHandlers, true);
interface->Get("OnScreenDisplayMessages", &bOnScreenDisplayMessages, true); interface->Get("OnScreenDisplayMessages", &bOnScreenDisplayMessages, true);
interface->Get("HideCursor", &bHideCursor, false); interface->Get("HideCursor", &bHideCursor, true);
interface->Get("LanguageCode", &m_InterfaceLanguage, ""); interface->Get("LanguageCode", &m_InterfaceLanguage, "");
interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false); interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false);
interface->Get("ShowActiveTitle", &m_show_active_title, true); interface->Get("ShowActiveTitle", &m_show_active_title, true);
@ -468,9 +468,9 @@ void SConfig::LoadGameListSettings(IniFile& ini)
gamelist->Get("ColumnBanner", &m_showBannerColumn, true); gamelist->Get("ColumnBanner", &m_showBannerColumn, true);
gamelist->Get("ColumnTitle", &m_showTitleColumn, true); gamelist->Get("ColumnTitle", &m_showTitleColumn, true);
gamelist->Get("ColumnNotes", &m_showMakerColumn, true); gamelist->Get("ColumnNotes", &m_showMakerColumn, true);
gamelist->Get("ColumnFileName", &m_showFileNameColumn, false); gamelist->Get("ColumnFileName", &m_showFileNameColumn, true);
gamelist->Get("ColumnFilePath", &m_showFilePathColumn, false); gamelist->Get("ColumnFilePath", &m_showFilePathColumn, false);
gamelist->Get("ColumnID", &m_showIDColumn, false); gamelist->Get("ColumnID", &m_showIDColumn, true);
gamelist->Get("ColumnRegion", &m_showRegionColumn, true); gamelist->Get("ColumnRegion", &m_showRegionColumn, true);
gamelist->Get("ColumnSize", &m_showSizeColumn, true); gamelist->Get("ColumnSize", &m_showSizeColumn, true);
gamelist->Get("ColumnFileFormat", &m_showFileFormatColumn, false); gamelist->Get("ColumnFileFormat", &m_showFileFormatColumn, false);
@ -494,14 +494,14 @@ void SConfig::LoadCoreSettings(IniFile& ini)
core->Get("JITFollowBranch", &bJITFollowBranch, true); core->Get("JITFollowBranch", &bJITFollowBranch, true);
core->Get("Fastmem", &bFastmem, true); core->Get("Fastmem", &bFastmem, true);
core->Get("DSPHLE", &bDSPHLE, true); core->Get("DSPHLE", &bDSPHLE, true);
core->Get("TimingVariance", &iTimingVariance, 40); core->Get("TimingVariance", &iTimingVariance, 8);
core->Get("CPUThread", &bCPUThread, true); core->Get("CPUThread", &bCPUThread, true);
core->Get("SyncOnSkipIdle", &bSyncGPUOnSkipIdleHack, true); core->Get("SyncOnSkipIdle", &bSyncGPUOnSkipIdleHack, true);
core->Get("EnableCheats", &bEnableCheats, false); core->Get("EnableCheats", &bEnableCheats, true);
core->Get("SelectedLanguage", &SelectedLanguage, 0); core->Get("SelectedLanguage", &SelectedLanguage, 0);
core->Get("OverrideRegionSettings", &bOverrideRegionSettings, false); core->Get("OverrideRegionSettings", &bOverrideRegionSettings, false);
core->Get("DPL2Decoder", &bDPL2Decoder, false); core->Get("DPL2Decoder", &bDPL2Decoder, false);
core->Get("AudioLatency", &iLatency, 20); core->Get("AudioLatency", &iLatency, 0);
core->Get("AudioStretch", &m_audio_stretch, false); core->Get("AudioStretch", &m_audio_stretch, false);
core->Get("AudioStretchMaxLatency", &m_audio_stretch_max_latency, 80); core->Get("AudioStretchMaxLatency", &m_audio_stretch_max_latency, 80);
core->Get("AgpCartAPath", &m_strGbaCartA); core->Get("AgpCartAPath", &m_strGbaCartA);
@ -611,7 +611,7 @@ void SConfig::LoadAnalyticsSettings(IniFile& ini)
analytics->Get("ID", &m_analytics_id, ""); analytics->Get("ID", &m_analytics_id, "");
analytics->Get("Enabled", &m_analytics_enabled, false); analytics->Get("Enabled", &m_analytics_enabled, false);
analytics->Get("PermissionAsked", &m_analytics_permission_asked, false); analytics->Get("PermissionAsked", &m_analytics_permission_asked, true);
} }
void SConfig::LoadBluetoothPassthroughSettings(IniFile& ini) void SConfig::LoadBluetoothPassthroughSettings(IniFile& ini)
@ -777,7 +777,7 @@ void SConfig::LoadDefaults()
#endif #endif
cpu_core = PowerPC::DefaultCPUCore(); cpu_core = PowerPC::DefaultCPUCore();
iTimingVariance = 40; iTimingVariance = 8;
bCPUThread = false; bCPUThread = false;
bSyncGPUOnSkipIdleHack = true; bSyncGPUOnSkipIdleHack = true;
bRunCompareServer = false; bRunCompareServer = false;