Deprecate game.conf name, use title instead (#12030)

[dragonfireclient.git] / src / content / content.cpp

diff --git a/src/content/content.cpp b/src/content/content.cpp
index 66ef83d42bbfec76362f5512d7426bde565b39b3..e576943ffcc0873aacfaa942f80608b497849bcf 100644 (file)
--- 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"))