Dont load mods that have no entry in world.mt

PilzAdam · PilzAdam · commit dcd0b63f645b · 2013-05-19T19:46:50.000+02:00
diff --git a/src/mods.cpp b/src/mods.cpp
@@ -220,7 +220,7 @@ ModConfiguration::ModConfiguration(std::string worldpath)
 	Settings worldmt_settings;
 	worldmt_settings.readConfigFile(worldmt.c_str());
 	std::vector<std::string> names = worldmt_settings.getNames();
-	std::set<std::string> exclude_mod_names;
+	std::set<std::string> include_mod_names;
 	for(std::vector<std::string>::iterator it = names.begin(); 
 		it != names.end(); ++it)
 	{	
@@ -229,14 +229,13 @@ ModConfiguration::ModConfiguration(std::string worldpath)
 		// explicitely excluded. if mod is not mentioned at all, it is
 		// enabled. So by default, all installed mods are enabled.
 		if (name.compare(0,9,"load_mod_") == 0 &&
-			!worldmt_settings.getBool(name))
+			worldmt_settings.getBool(name))
 		{
-			exclude_mod_names.insert(name.substr(9));
+			include_mod_names.insert(name.substr(9));
 		}
 	}
 
-	// Collect all mods in gamespec.addon_mods_paths,
-	// excluding those in the set exclude_mod_names
+	// Collect all mods that are also in include_mod_names
 	std::vector<ModSpec> addon_mods;
 	for(std::set<std::string>::const_iterator it_path = gamespec.addon_mods_paths.begin();
 			it_path != gamespec.addon_mods_paths.end(); ++it_path)
@@ -246,7 +245,7 @@ ModConfiguration::ModConfiguration(std::string worldpath)
 			it != addon_mods_in_path.end(); ++it)
 		{
 			ModSpec& mod = *it;
-			if(exclude_mod_names.count(mod.name) == 0)
+			if(include_mod_names.count(mod.name) != 0)
 				addon_mods.push_back(mod);
 		}
 	}
diff --git a/src/server.cpp b/src/server.cpp
@@ -727,19 +727,13 @@ Server::Server(
 	std::string worldmt = m_path_world + DIR_DELIM + "world.mt";
 	worldmt_settings.readConfigFile(worldmt.c_str());
 	std::vector<std::string> names = worldmt_settings.getNames();
-	std::set<std::string> exclude_mod_names;
 	std::set<std::string> load_mod_names;
 	for(std::vector<std::string>::iterator it = names.begin(); 
 		it != names.end(); ++it)
 	{	
 		std::string name = *it;  
-		if (name.compare(0,9,"load_mod_")==0)
-		{
-			if(worldmt_settings.getBool(name))
-				load_mod_names.insert(name.substr(9));
-			else			
-				exclude_mod_names.insert(name.substr(9));
-		}
+		if(name.compare(0,9,"load_mod_")==0 && worldmt_settings.getBool(name))
+			load_mod_names.insert(name.substr(9));
 	}
 	// complain about mods declared to be loaded, but not found
 	for(std::vector<ModSpec>::iterator it = m_mods.begin();

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ ModConfiguration::ModConfiguration(std::string worldpath)`
`220`	`220`	`Settings worldmt_settings;`
`221`	`221`	`worldmt_settings.readConfigFile(worldmt.c_str());`
`222`	`222`	`std::vector<std::string> names = worldmt_settings.getNames();`
`223`		`- std::set<std::string> exclude_mod_names;`
	`223`	`+ std::set<std::string> include_mod_names;`
`224`	`224`	`for(std::vector<std::string>::iterator it = names.begin();`
`225`	`225`	`it != names.end(); ++it)`
`226`	`226`	`{`
`@@ -229,14 +229,13 @@ ModConfiguration::ModConfiguration(std::string worldpath)`
`229`	`229`	`// explicitely excluded. if mod is not mentioned at all, it is`
`230`	`230`	`// enabled. So by default, all installed mods are enabled.`
`231`	`231`	`if (name.compare(0,9,"load_mod_") == 0 &&`
`232`		`- !worldmt_settings.getBool(name))`
	`232`	`+ worldmt_settings.getBool(name))`
`233`	`233`	`{`
`234`		`- exclude_mod_names.insert(name.substr(9));`
	`234`	`+ include_mod_names.insert(name.substr(9));`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
`238`		`- // Collect all mods in gamespec.addon_mods_paths,`
`239`		`- // excluding those in the set exclude_mod_names`
	`238`	`+ // Collect all mods that are also in include_mod_names`
`240`	`239`	`std::vector<ModSpec> addon_mods;`
`241`	`240`	`for(std::set<std::string>::const_iterator it_path = gamespec.addon_mods_paths.begin();`
`242`	`241`	`it_path != gamespec.addon_mods_paths.end(); ++it_path)`
`@@ -246,7 +245,7 @@ ModConfiguration::ModConfiguration(std::string worldpath)`
`246`	`245`	`it != addon_mods_in_path.end(); ++it)`
`247`	`246`	`{`
`248`	`247`	`ModSpec& mod = *it;`
`249`		`- if(exclude_mod_names.count(mod.name) == 0)`
	`248`	`+ if(include_mod_names.count(mod.name) != 0)`
`250`	`249`	`addon_mods.push_back(mod);`
`251`	`250`	`}`
`252`	`251`	`}`