Archives/MangoHud
2
0
Fork 0
mirror of https://github.com/flightlessmango/MangoHud.git synced 2024-11-10 01:10:27 +00:00
Code Issues Projects Releases Wiki Activity

config: rename param to "read_cfg"

Browse Source
This commit is contained in:
jackun 2020-02-18 11:47:58 +02:00
parent ad2ed4a99a
commit 68e880a101
No known key found for this signature in database
GPG Key ID: 119DB3F1D05A9ED3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/overlay_params.cpp
View File

@ -258,7 +258,7 @@ parse_overlay_config(struct overlay_params *params,
params->enabled[OVERLAY_PARAM_ENABLED_gpu_stats] = true; params->enabled[OVERLAY_PARAM_ENABLED_gpu_stats] = true;
params->enabled[OVERLAY_PARAM_ENABLED_ram] = false; params->enabled[OVERLAY_PARAM_ENABLED_ram] = false;
params->enabled[OVERLAY_PARAM_ENABLED_vram] = false; params->enabled[OVERLAY_PARAM_ENABLED_vram] = false;
params->enabled[OVERLAY_PARAM_ENABLED_read_configs] = false; params->enabled[OVERLAY_PARAM_ENABLED_read_cfg] = false;
params->fps_sampling_period = 500000; /* 500ms */ params->fps_sampling_period = 500000; /* 500ms */
params->width = 280; params->width = 280;
params->height = 140; params->height = 140;
@ -276,8 +276,8 @@ parse_overlay_config(struct overlay_params *params,
if (env) if (env)
parse_overlay_env(params, env); parse_overlay_env(params, env);
bool rc = params->enabled[OVERLAY_PARAM_ENABLED_read_configs]; bool read_cfg = params->enabled[OVERLAY_PARAM_ENABLED_read_cfg];
if (!env || rc) { if (!env || read_cfg) {
// Get config options // Get config options
parseConfigFile(); parseConfigFile();
@ -313,7 +313,7 @@ parse_overlay_config(struct overlay_params *params,
} }
// second pass, override config file settings with MANGOHUD_CONFIG // second pass, override config file settings with MANGOHUD_CONFIG
if (env && rc) if (env && read_cfg)
parse_overlay_env(params, env); parse_overlay_env(params, env);
// if font_size is used and height has not been changed from default // if font_size is used and height has not been changed from default

2
src/overlay_params.h
View File

@ -49,7 +49,7 @@ extern "C" {
OVERLAY_PARAM_BOOL(crosshair) \ OVERLAY_PARAM_BOOL(crosshair) \
OVERLAY_PARAM_BOOL(time) \ OVERLAY_PARAM_BOOL(time) \
OVERLAY_PARAM_BOOL(full) \ OVERLAY_PARAM_BOOL(full) \
OVERLAY_PARAM_BOOL(read_configs) \ OVERLAY_PARAM_BOOL(read_cfg) \
OVERLAY_PARAM_CUSTOM(fps_sampling_period) \ OVERLAY_PARAM_CUSTOM(fps_sampling_period) \
OVERLAY_PARAM_CUSTOM(output_file) \ OVERLAY_PARAM_CUSTOM(output_file) \
OVERLAY_PARAM_CUSTOM(position) \ OVERLAY_PARAM_CUSTOM(position) \