mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'useropenmwcscfg' into 'master'

Browse Source 
Adjust intro comment for user openmw-cs.cfg (#5859)

Closes #5859

See merge request OpenMW/openmw!4437
This commit is contained in:
Evil Eye 2024-10-31 18:55:39 +00:00
commit 20d910565b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -274,6 +274,7 @@
Feature #8078: OpenMW-CS Terrain Equalize Tool
Feature #8087: Creature movement flags are not exposed
Feature #8145: Starter spell flag is not exposed
Task #5859: User openmw-cs.cfg has comment talking about settings.cfg
Task #5896: Do not use deprecated MyGUI properties
Task #6085: Replace boost::filesystem with std::filesystem
Task #6149: Dehardcode Lua API_REVISION

23
components/settings/parser.cpp
View File

@ -287,13 +287,24 @@ void Settings::SettingsFileParser::saveSettingsFile(
// exist), start the newly created file with a helpful comment.
if (!existing)
{
ostream << "# This is the OpenMW user 'settings.cfg' file. This file only contains" << std::endl;
const std::string filename = Files::pathToUnicodeString(file.filename());
ostream << "# This is the OpenMW user '" << filename << "' file. This file only contains" << std::endl;
ostream << "# explicitly changed settings. If you would like to revert a setting" << std::endl;
ostream << "# to its default, simply remove it from this file. For available" << std::endl;
ostream << "# settings, see the file 'files/settings-default.cfg' in our source repo or the documentation at:"
<< std::endl;
ostream << "#" << std::endl;
ostream << "# https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
ostream << "# to its default, simply remove it from this file." << std::endl;
if (filename == "settings.cfg")
{
ostream << "# For available settings, see the file 'files/settings-default.cfg' in our source repo or the "
"documentation at:"
<< std::endl;
ostream << "#" << std::endl;
ostream << "# https://openmw.readthedocs.io/en/master/reference/modding/settings/index.html" << std::endl;
}
else if (filename == "openmw-cs.cfg")
{
ostream << "# For available settings, see the file 'apps/opencs/model/prefs/values.hpp' in our source repo."
<< std::endl;
}
}
// We still have one more thing to do before we're completely done writing the file.