RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move unspecific Emulator code out of System.cpp

Browse source
This commit is contained in:
Megamouse 2021-04-21 22:12:21 +02:00 • committed by Ivan
parent 4c2a11b6d0
commit 1caf81811a
38 changed files with 729 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/Io/PadHandler.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "PadHandler.h"
#include "Emu/System.h"
#include "Emu/system_utils.hpp"
#include "Input/pad_thread.h"
#include "Input/product_info.h"
@ -292,16 +292,16 @@ std::string PadHandlerBase::get_config_dir(pad_handler type, const std::string&
{
if (!title_id.empty())
{
return Emulator::GetCustomInputConfigDir(title_id) + fmt::format("%s", type) + "/";
return rpcs3::utils::get_custom_input_config_dir(title_id) + fmt::format("%s", type) + "/";
}
return fs::get_config_dir() + "/InputConfigs/" + fmt::format("%s", type) + "/";
}
std::string PadHandlerBase::get_config_filename(int i, const std::string& title_id)
{
if (!title_id.empty() && fs::is_file(Emulator::GetCustomInputConfigPath(title_id)))
if (!title_id.empty() && fs::is_file(rpcs3::utils::get_custom_input_config_path(title_id)))
{
const std::string path = Emulator::GetCustomInputConfigDir(title_id) + g_cfg_input.player[i]->handler.to_string() + "/" + g_cfg_input.player[i]->profile.to_string() + ".yml";
const std::string path = rpcs3::utils::get_custom_input_config_dir(title_id) + g_cfg_input.player[i]->handler.to_string() + "/" + g_cfg_input.player[i]->profile.to_string() + ".yml";
if (fs::is_file(path))
{
return path;