X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmods.h;h=f35bd18dba0b5e01c8046c1d6d423f1171d08a04;hb=2fee2baf98cd452f7d0e4acb6c82617b7c7b995a;hp=e10d49324bbf8a603af9f54f4d29f4576466c5ac;hpb=5c7ecdb7c583c98cbe6bdf54ae7a07e6a6a61007;p=oweals%2Fminetest.git

diff --git a/src/mods.h b/src/mods.h
index e10d49324..f35bd18db 100644
--- a/src/mods.h
+++ b/src/mods.h
@@ -21,21 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MODS_HEADER
 
 #include "irrlichttypes.h"
-#include <irrList.h>
 #include <list>
 #include <set>
 #include <vector>
 #include <string>
 #include <map>
 #include <exception>
-#include <list>
 #include "json/json.h"
 #include "config.h"
 
-#if USE_CURL
-#include <curl/curl.h>
-#endif
-
 #define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_"
 
 class ModError : public std::exception
@@ -68,7 +62,7 @@ struct ModSpec
 	bool is_modpack;
 	// if modpack:
 	std::map<std::string,ModSpec> modpack_content;
-	ModSpec(const std::string name_="", const std::string path_=""):
+	ModSpec(const std::string &name_="", const std::string &path_=""):
 		name(name_),
 		path(path_),
 		depends(),
@@ -106,7 +100,7 @@ public:
 		m_name_conflicts()
 	{}
 
-		
+
 	ModConfiguration(std::string worldpath);
 
 	// checks if all dependencies are fullfilled.
@@ -152,10 +146,9 @@ private:
 	// exists. A name conflict happens when two or more mods
 	// at the same level have the same name but different paths.
 	// Levels (mods in higher levels override mods in lower levels):
-	// 1. common mod in modpack; 2. common mod;
-	// 3. game mod in modpack; 4. game mod;
-	// 5. world mod in modpack; 6. world mod;
-	// 7. addon mod in modpack; 8. addon mod.
+	// 1. game mod in modpack; 2. game mod;
+	// 3. world mod in modpack; 4. world mod;
+	// 5. addon mod in modpack; 6. addon mod.
 	std::set<std::string> m_name_conflicts;
 
 };