refacto: hide mesh_cache inside the rendering engine

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

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