AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-13 11:11:22 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to easily unset CVars from the command line

Browse Source
This commit is contained in:
Phillip Stephens 2025-04-15 18:48:56 -07:00
parent e72b05a7ac
commit 17000766fe
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Runtime/ConsoleVariables/CVarManager.cpp
View File

@ -28,7 +28,9 @@ CVar* com_configfile = nullptr;
CVar* com_enableCheats = nullptr; CVar* com_enableCheats = nullptr;
CVar* com_cubemaps = nullptr; CVar* com_cubemaps = nullptr;
static const std::regex cmdLineRegex(R"(\+([\w\.]+)([=])?([\/\\\s\w\.\-]+)?)"); static const std::regex cmdLineRegexEnable(R"(^\+([\w\.]+)([=])?([\/\\\s\w\.\-]+)?)");
static const std::regex cmdLineRegexDisable(R"(^\-([\w\.]+)([=])?([\/\\\s\w\.\-]+)?)");
CVarManager* CVarManager::m_instance = nullptr; CVarManager* CVarManager::m_instance = nullptr;
CVarManager::CVarManager(FileStoreManager& store, bool useBinary) : m_store(store), m_useBinary(useBinary) { CVarManager::CVarManager(FileStoreManager& store, bool useBinary) : m_store(store), m_useBinary(useBinary) {
@ -270,15 +272,15 @@ void CVarManager::parseCommandLine(const std::vector<std::string>& args) {
std::string developerName(com_developer->name()); std::string developerName(com_developer->name());
CStringExtras::ToLower(developerName); CStringExtras::ToLower(developerName);
for (const std::string& arg : args) { for (const std::string& arg : args) {
if (arg[0] != '+') { if (arg[0] != '+' && arg[0] != '-') {
continue; continue;
} }
std::smatch matches; std::smatch matches;
std::string cvarName; std::string cvarName;
std::string cvarValue; std::string cvarValue;
bool set = false;
if (std::regex_match(arg, matches, cmdLineRegex)) { if (std::regex_match(arg, matches, cmdLineRegexEnable)) {
std::vector<std::string> realMatches; std::vector<std::string> realMatches;
for (auto match : matches) { for (auto match : matches) {
if (match.matched) { if (match.matched) {
@ -291,26 +293,42 @@ void CVarManager::parseCommandLine(const std::vector<std::string>& args) {
cvarName = matches[1].str(); cvarName = matches[1].str();
cvarValue = matches[3].str(); cvarValue = matches[3].str();
} }
set = true;
} else if (std::regex_match(arg, matches, cmdLineRegexDisable)) {
std::vector<std::string> realMatches;
for (auto match : matches) {
if (match.matched) {
realMatches.push_back(match);
}
}
if (realMatches.size() == 2) {
cvarName = matches[1].str();
} else if (realMatches.size() == 4) {
cvarName = matches[1].str();
cvarValue = matches[3].str();
}
set = false;
} }
if (CVar* cv = findCVar(cvarName)) { if (CVar* cv = findCVar(cvarName)) {
if (cvarValue.empty() && cv->isBoolean()) { if (cvarValue.empty() && cv->isBoolean()) {
// We were set from the command line with an empty value, assume true // We were set from the command line with an empty value, assume true
cv->fromBoolean(true); cv->fromBoolean(set);
} else if (!cvarValue.empty()) { } else if (!cvarValue.empty()) {
cv->fromLiteralToType(cvarValue); cv->fromLiteralToType(cvarValue);
} }
cv->m_wasDeserialized = true; cv->m_wasDeserialized = true;
cv->forceClearModified(); cv->forceClearModified();
CStringExtras::ToLower(cvarName); CStringExtras::ToLower(cvarName);
if (developerName == cvarName) if (developerName == cvarName) {
/* Make sure we're not overriding developer mode when we restore */ /* Make sure we're not overriding developer mode when we restore */
oldDeveloper = com_developer->toBoolean(); oldDeveloper = com_developer->toBoolean();
}
} else { } else {
/* Unable to find an existing CVar, let's defer for the time being 8 */ /* Unable to find an existing CVar, let's defer for the time being 8 */
CStringExtras::ToLower(cvarName); CStringExtras::ToLower(cvarName);
if (cvarValue.empty()) { if (cvarValue.empty()) {
cvarValue = "true"; cvarValue = set ? "true" : "false";
} }
m_deferedCVars.insert(std::make_pair<std::string, std::string>(std::move(cvarName), std::move(cvarValue))); m_deferedCVars.insert(std::make_pair<std::string, std::string>(std::move(cvarName), std::move(cvarValue)));
} }