piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove pre-generated SYSCONF

Browse Source 
Dolphin is able to generate one with all correct default settings, so
we don't need to ship with a pre-generated SYSCONF and worry about
syncing default settings.

Additionally, this commit changes SysConf to work with session SYSCONFs
so that Dolphin is able to generate a default one even for Movie/TAS.
Which SYSCONF needs to be touched is explicitly specified to avoid
confusion about which file SysConf is managing.

(Another notable change is that the Wii root functions are moved into
Core to prevent Common from depending on Core.)
This commit is contained in:
Léo Lam
2017-01-06 21:59:02 +01:00
parent d346d4ced1
commit 64101137cd
14 changed files with 111 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/SysConf.h
View File

@ -13,6 +13,7 @@
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
#include "Common/NandPaths.h"
namespace File
{
@ -79,7 +80,7 @@ struct SSysConfEntry
class SysConf
{
public:
SysConf();
SysConf(Common::FromWhichRoot root_type);
~SysConf();
bool IsValid() { return m_IsValid; }
@ -176,13 +177,13 @@ public:
bool SaveToFile(const std::string& filename);
bool LoadFromFile(const std::string& filename);
bool Reload();
// This function is used when the NAND root is changed
void UpdateLocation();
void UpdateLocation(Common::FromWhichRoot root_type);
private:
bool LoadFromFileInternal(File::IOFile&& file);
void GenerateSysConf();
void Clear();
void ApplySettingsFromMovie();
std::string m_Filename;
std::string m_FilenameDefault;