Merge pull request #13510 from silicons/google

a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
parent 9e909095a8 21d3d8fcd9
commit bf7d68884b
8 changed files with 118 additions and 35 deletions
@@ -55,9 +55,10 @@ SUBSYSTEM_DEF(job)
 			continue
 		if(!job.config_check())
 			continue
-		if(!job.map_check())	//Even though we initialize before mapping, this is fine because the config is loaded at new
+		if(!job.map_check(SSmapping.config))	//Even though we initialize before mapping, this is fine because the config is loaded at new
 			testing("Removed [job.type] due to map config");
 			continue
+		job.process_map_overrides(SSmapping.config)
 		occupations += job
 		name_occupations[job.title] = job
 		type_occupations[J] = job