From 70bf3439ab9f3cb826d76111552dcc38678fcf3d Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sun, 6 Jan 2019 09:23:35 +0000 Subject: Deprecate modpack.txt and use modpack.conf instead (#7892) * Deprecate modpack.txt and use modpack.conf instead --- src/content/content.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/content/content.cpp') diff --git a/src/content/content.cpp b/src/content/content.cpp index d7a2c9652..66ef83d42 100644 --- a/src/content/content.cpp +++ b/src/content/content.cpp @@ -41,6 +41,12 @@ ContentType getContentType(const ContentSpec &spec) return ECT_MODPACK; } + std::ifstream modpack2_is((spec.path + DIR_DELIM + "modpack.conf").c_str()); + if (modpack2_is.good()) { + modpack2_is.close(); + return ECT_MODPACK; + } + std::ifstream init_is((spec.path + DIR_DELIM + "init.lua").c_str()); if (init_is.good()) { init_is.close(); @@ -73,7 +79,7 @@ void parseContentInfo(ContentSpec &spec) break; case ECT_MODPACK: spec.type = "modpack"; - conf_path = spec.path + DIR_DELIM + "mod.conf"; + conf_path = spec.path + DIR_DELIM + "modpack.conf"; break; case ECT_GAME: spec.type = "game"; -- cgit v1.2.3