diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-22 12:05:27 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-05-22 12:05:27 +0200 |
| commit | 3ff3103e98b350712543f926c429ab339700e252 (patch) | |
| tree | 61827d6b7dcb51c38f17f068c8b498c16a0db1c3 /src/content/content.cpp | |
| parent | 350b6d175c406fbbc002237f37db4cf88d6d3d19 (diff) | |
| parent | 9f338f5a56e5adee3d11d59827f7e2b8a714e6c2 (diff) | |
| download | dragonfireclient-3ff3103e98b350712543f926c429ab339700e252.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/content/content.cpp')
| -rw-r--r-- | src/content/content.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/content/content.cpp b/src/content/content.cpp index 66ef83d42..e576943ff 100644 --- a/src/content/content.cpp +++ b/src/content/content.cpp @@ -96,7 +96,12 @@ void parseContentInfo(ContentSpec &spec) Settings conf; if (!conf_path.empty() && conf.readConfigFile(conf_path.c_str())) { - if (conf.exists("name")) + if (conf.exists("title")) + spec.title = conf.get("title"); + else if (spec.type == "game" && conf.exists("name")) + spec.title = conf.get("name"); + + if (spec.type != "game" && conf.exists("name")) spec.name = conf.get("name"); if (conf.exists("description")) |