Cleaning up

pull/28/head
FlightlessMango 4 years ago
parent 33f48c91be
commit 5a62a1b0de

@ -7,7 +7,7 @@
#include <vector>
std::unordered_map<std::string,std::string> options;
void parseConfigLine(std::string line, struct overlay_params *params){
void parseConfigLine(std::string line){
if(line.find("#")!=std::string::npos)
{
line = line.erase(line.find("#"),std::string::npos);
@ -29,10 +29,11 @@ void parseConfigLine(std::string line, struct overlay_params *params){
{
return;
}
options.insert({line.substr(0,equal), line.substr(equal+1)});
options.insert({line.substr(0,equal), line.substr(equal+1)});
}
void parseConfigFile(struct overlay_params *params) {
void parseConfigFile() {
std::string home = std::getenv("HOME");
std::string filePath = home + "/.local/share/MangoHud/MangoHud.conf";
std::ifstream stream(filePath);
@ -41,6 +42,6 @@ void parseConfigFile(struct overlay_params *params) {
while (std::getline(stream, line))
{
parseConfigLine(line, params);
parseConfigLine(line);
}
}

@ -2,4 +2,4 @@
extern std::unordered_map<std::string,std::string> options;
void parseConfigFile(struct overlay_params *params);
void parseConfigFile(void);

@ -202,7 +202,7 @@ parse_overlay_env(struct overlay_params *params,
params->toggle_logging = 65471;
// Get config options
parseConfigFile(params);
parseConfigFile();
for (auto& it : options) {
#define OVERLAY_PARAM_BOOL(name) \
if (it.first == #name) { \
@ -220,7 +220,7 @@ parse_overlay_env(struct overlay_params *params,
#undef OVERLAY_PARAM_CUSTOM
fprintf(stderr, "Unknown option '%s'\n", it.first.c_str());
}
if (!env)
return;

Loading…
Cancel
Save