N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CFG: More style changes

Browse source
This commit is contained in:
Subv 2014-12-21 18:02:27 -05:00
parent f080e3ccfa
commit 304735fb52
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/service/cfg/cfg.cpp
View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include "common/log.h" #include "common/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"
#include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/archive_systemsavedata.h"
@ -33,8 +34,8 @@ const std::array<float, 8> STEREO_CAMERA_SETTINGS = {
10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f 10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f
}; };
const u32 CONFIG_SAVEFILE_SIZE = 0x8000; static const u32 CONFIG_SAVEFILE_SIZE = 0x8000;
std::array<u8, CONFIG_SAVEFILE_SIZE> cfg_config_file_buffer = {}; static std::array<u8, CONFIG_SAVEFILE_SIZE> cfg_config_file_buffer;
static std::unique_ptr<FileSys::Archive_SystemSaveData> cfg_system_save_data; static std::unique_ptr<FileSys::Archive_SystemSaveData> cfg_system_save_data;
@ -118,7 +119,7 @@ ResultCode FormatConfig() {
if (!res.IsSuccess()) if (!res.IsSuccess())
return res; return res;
// Delete the old data // Delete the old data
std::fill(cfg_config_file_buffer.begin(), cfg_config_file_buffer.end(), 0); cfg_config_file_buffer.fill(0);
// Create the header // Create the header
SaveFileConfig* config = reinterpret_cast<SaveFileConfig*>(cfg_config_file_buffer.data()); SaveFileConfig* config = reinterpret_cast<SaveFileConfig*>(cfg_config_file_buffer.data());
// This value is hardcoded, taken from 3dbrew, verified by hardware, it's always the same value // This value is hardcoded, taken from 3dbrew, verified by hardware, it's always the same value
@ -160,9 +161,8 @@ ResultCode FormatConfig() {
void CFGInit() { void CFGInit() {
// TODO(Subv): In the future we should use the FS service to query this archive, // TODO(Subv): In the future we should use the FS service to query this archive,
// currently it is not possible because you can only have one open archive of the same type at any time // currently it is not possible because you can only have one open archive of the same type at any time
using Common::make_unique;
std::string syssavedata_directory = FileUtil::GetUserPath(D_SYSSAVEDATA_IDX); std::string syssavedata_directory = FileUtil::GetUserPath(D_SYSSAVEDATA_IDX);
cfg_system_save_data = make_unique<FileSys::Archive_SystemSaveData>( cfg_system_save_data = Common::make_unique<FileSys::Archive_SystemSaveData>(
syssavedata_directory, CFG_SAVE_ID); syssavedata_directory, CFG_SAVE_ID);
if (!cfg_system_save_data->Initialize()) { if (!cfg_system_save_data->Initialize()) {
LOG_CRITICAL(Service_CFG, "Could not initialize SystemSaveData archive for the CFG:U service"); LOG_CRITICAL(Service_CFG, "Could not initialize SystemSaveData archive for the CFG:U service");