[CSM] Don't Load the package library (#6944)

[minetest.git] / src / mods.h

diff --git a/src/mods.h b/src/mods.h
index 792280b8b4faed58b2facd3a0057c0f1c787a0d4..50ada328ebed6c38e45ecb19b978b417c6985a49 100644 (file)
--- a/src/mods.h
+++ b/src/mods.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MODS_HEADER
-#define MODS_HEADER
+#pragma once
 
 #include "irrlichttypes.h"
 #include <list>
@@ -42,19 +41,13 @@ struct ModSpec
        std::unordered_set<std::string> optdepends;
        std::unordered_set<std::string> unsatisfied_depends;
 
-       bool part_of_modpack;
-       bool is_modpack;
+       bool part_of_modpack = false;
+       bool is_modpack = false;
        // if modpack:
        std::map<std::string,ModSpec> modpack_content;
        ModSpec(const std::string &name_="", const std::string &path_=""):
                name(name_),
-               path(path_),
-               depends(),
-               optdepends(),
-               unsatisfied_depends(),
-               part_of_modpack(false),
-               is_modpack(false),
-               modpack_content()
+               path(path_)
        {}
 };
 
@@ -99,7 +92,7 @@ class ModConfiguration
        // adds all mods in the set.
        void addMods(const std::vector<ModSpec> &new_mods);
 
-       void addModsFormConfig(const std::string &settings_path, const std::set<std::string> &mods);
+       void addModsFromConfig(const std::string &settings_path, const std::set<std::string> &mods);
 
        void checkConflictsAndDeps();
 private:
@@ -128,7 +121,7 @@ class ModConfiguration
        std::unordered_set<std::string> m_name_conflicts;
 
        // Deleted default constructor
-       ModConfiguration() {}
+       ModConfiguration() = default;
 
 };
 
@@ -147,15 +140,6 @@ class ClientModConfiguration: public ModConfiguration
 };
 #endif
 
-#if USE_CURL
-Json::Value getModstoreUrl(const std::string &url);
-#else
-inline Json::Value getModstoreUrl(const std::string &url)
-{
-       return Json::Value();
-}
-#endif
-
 struct ModLicenseInfo {
        int id;
        std::string shortinfo;
@@ -167,62 +151,11 @@ struct ModAuthorInfo {
        std::string username;
 };
 
-struct ModStoreMod {
-       int id;
-       std::string title;
-       std::string basename;
-       ModAuthorInfo author;
-       float rating;
-       bool valid;
-};
-
-struct ModStoreCategoryInfo {
-       int id;
-       std::string name;
-};
-
-struct ModStoreVersionEntry {
-       int id;
-       std::string date;
-       std::string file;
-       bool approved;
-       //ugly version number
-       int mtversion;
-};
-
-struct ModStoreTitlePic {
-       int id;
-       std::string file;
-       std::string description;
-       int mod;
-};
-
-struct ModStoreModDetails {
-       /* version_set?? */
-       std::vector<ModStoreCategoryInfo> categories;
-       ModAuthorInfo author;
-       ModLicenseInfo license;
-       ModStoreTitlePic titlepic;
-       int id;
-       std::string title;
-       std::string basename;
-       std::string description;
-       std::string repository;
-       float rating;
-       std::vector<std::string> depends;
-       std::vector<std::string> softdeps;
-
-       std::string download_url;
-       std::string screenshot_url;
-       std::vector<ModStoreVersionEntry> versions;
-       bool valid;
-};
-
 class ModMetadata: public Metadata
 {
 public:
        ModMetadata(const std::string &mod_name);
-       ~ModMetadata() {}
+       ~ModMetadata() = default;
 
        virtual void clear();
 
@@ -235,7 +168,5 @@ class ModMetadata: public Metadata
        virtual bool setString(const std::string &name, const std::string &var);
 private:
        std::string m_mod_name;
-       bool m_modified;
+       bool m_modified = false;
 };
-
-#endif