R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move sdk specific cfg files to different folder

Browse Source 
Move all SDK internal CFG's to 'cfg/system'.
This commit is contained in:
Kawe Mazidjatari 2023-03-24 00:04:45 +01:00
parent 1758abb0aa
commit 193c5bdeba
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
r5dev/thirdparty/imgui/include/imgui_utility.h vendored
View File

@ -1,6 +1,5 @@
#pragma once
constexpr char IMGUI_BIND_PATH[] = "cfg/imgui/";
constexpr char IMGUI_BIND_FILE[] = "bind.json";
enum class ImGuiStyle_t

2
r5dev/thirdparty/imgui/src/imgui.cpp vendored
View File

@ -1172,7 +1172,7 @@ ImGuiIO::ImGuiIO()
DisplaySize = ImVec2(-1.0f, -1.0f);
DeltaTime = 1.0f / 60.0f;
IniSavingRate = 5.0f;
IniFilename = "platform\\cfg\\imgui\\layout.ini"; // Important: "imgui_layout.ini" is relative to current working dir, most apps will want to lock this to an absolute path (e.g. same path as executables).
IniFilename = "platform\\cfg\\system\\layout.ini"; // Important: "imgui_layout.ini" is relative to current working dir, most apps will want to lock this to an absolute path (e.g. same path as executables).
LogFilename = "platform\\logs\\imgui_log.txt";
MouseDoubleClickTime = 0.30f;
MouseDoubleClickMaxDist = 6.0f;

8
r5dev/thirdparty/imgui/src/imgui_utility.cpp vendored
View File

@ -10,10 +10,10 @@
void ImGuiConfig::Load()
{
const string svPath = fmt::format("{:s}{:s}", IMGUI_BIND_PATH, IMGUI_BIND_FILE);
const string svPath = Format(SDK_SYSTEM_CFG_PATH"%s", IMGUI_BIND_FILE);
DevMsg(eDLL_T::MS, "Loading ImGui config file '%s'\n", svPath.c_str());
FileSystem()->CreateDirHierarchy(IMGUI_BIND_PATH, "PLATFORM"); // Create directory, so ImGui can load/save 'layout.ini'.
FileSystem()->CreateDirHierarchy(SDK_SYSTEM_CFG_PATH, "PLATFORM"); // Create directory, so ImGui can load/save 'layout.ini'.
FileHandle_t hFile = FileSystem()->Open(svPath.c_str(), "rt", "PLATFORM");
if (!hFile)
@ -54,10 +54,10 @@ void ImGuiConfig::Load()
void ImGuiConfig::Save()
{
const string svPath = fmt::format("{:s}{:s}", IMGUI_BIND_PATH, IMGUI_BIND_FILE);
const string svPath = Format(SDK_SYSTEM_CFG_PATH"%s", IMGUI_BIND_FILE);
DevMsg(eDLL_T::MS, "Saving ImGui config file '%s'\n", svPath.c_str());
FileSystem()->CreateDirHierarchy(IMGUI_BIND_PATH, "PLATFORM");
FileSystem()->CreateDirHierarchy(SDK_SYSTEM_CFG_PATH, "PLATFORM");
FileHandle_t hFile = FileSystem()->Open(svPath.c_str(), "wt", "PLATFORM");
if (!hFile)

5
r5dev/tier0/basetypes.h
View File

@ -149,10 +149,11 @@
#define SDK_ARRAYSIZE(arr) ((sizeof(arr) / sizeof(*arr))) // Name due to IMGUI implementation and NT implementation that we shouldn't share across everywhere.
#ifndef DEDICATED
#define SDK_DEFAULT_CFG "platform\\cfg\\startup_default.cfg"
#define SDK_DEFAULT_CFG "platform/cfg/startup_default.cfg"
#else
#define SDK_DEFAULT_CFG "platform\\cfg\\startup_dedi_default.cfg"
#define SDK_DEFAULT_CFG "platform/cfg/startup_dedi_default.cfg"
#endif
#define SDK_SYSTEM_CFG_PATH "cfg/system/"
// #define COMPILETIME_MAX and COMPILETIME_MIN for max/min in constant expressions
#define COMPILETIME_MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )