Preload asteroids and debris when config-field sexps are used (#6874)

Author: MjnMixael

code/asteroid/asteroid.cpp

@@ -2542,31 +2542,29 @@ int get_asteroid_index(const char* asteroid_name)
 	return -1;
 }
 
-// For FRED. Gets a list of unique asteroid subtype names
-SCP_vector<SCP_string> get_list_valid_asteroid_subtypes()
+// Returns the list of unique asteroid subtype names.
+// List is cached after the first call since Asteroid_info cannot change during an engine instance.
+const SCP_vector<SCP_string>& get_list_valid_asteroid_subtypes()
 {
-	SCP_vector<SCP_string> list;
-
-	for (const auto& this_asteroid : Asteroid_info) {
-		if (this_asteroid.type != ASTEROID_TYPE_DEBRIS) {
-			for (const auto& subtype : this_asteroid.subtypes) {
-				bool exists = false;
-				for (const auto& entry : list) {
-					if (subtype.type_name == entry) {
-						exists = true;
+	static SCP_vector<SCP_string> list;
+
+	if (list.empty()) {
+		for (const auto& this_asteroid : Asteroid_info) {
+			if (this_asteroid.type != ASTEROID_TYPE_DEBRIS) {
+				for (const auto& subtype : this_asteroid.subtypes) {
+					// Only add unique names
+					if (std::find(list.begin(), list.end(), subtype.type_name) == list.end()) {
+						list.push_back(subtype.type_name);
 					}
 				}
-
-				if (!exists) {
-					list.push_back(subtype.type_name);
-				}
 			}
 		}
 	}
 
 	return list;
 }
 
+
 static void verify_asteroid_splits() 
 {
 

code/asteroid/asteroid.h

@@ -179,7 +179,8 @@ void	asteroid_show_brackets();
 void	asteroid_target_closest_danger();
 void asteroid_add_target(object* objp);
 int get_asteroid_index(const char* asteroid_name);
-SCP_vector<SCP_string> get_list_valid_asteroid_subtypes();
+const SCP_vector<SCP_string>& get_list_valid_asteroid_subtypes();
+int get_asteroid_subtype_index_by_name(const SCP_string& name, int asteroid_idx);
 
 // extern for the lab
 void asteroid_load(int asteroid_info_index, int asteroid_subtype);

code/parse/sexp.cpp

@@ -4426,6 +4426,32 @@ void preload_change_ship_class(const char *text)
 		model_page_in_textures(sip->model_num, idx);
 }
 
+// MjnMixael
+void preload_asteroid_class(const char* text)
+{
+	const auto& list = get_list_valid_asteroid_subtypes();
+
+	bool valid = std::any_of(list.begin(), list.end(), [&](const SCP_string& item) { return !stricmp(text, item.c_str()); });
+
+	if (!valid)
+		return;
+
+	asteroid_load(ASTEROID_TYPE_SMALL, get_asteroid_subtype_index_by_name(text, ASTEROID_TYPE_SMALL));
+	asteroid_load(ASTEROID_TYPE_MEDIUM, get_asteroid_subtype_index_by_name(text, ASTEROID_TYPE_MEDIUM));
+	asteroid_load(ASTEROID_TYPE_LARGE, get_asteroid_subtype_index_by_name(text, ASTEROID_TYPE_LARGE));
+
+}	
+
+// MjnMixael
+void preload_debris_class(const char* text)
+{
+	auto idx = get_asteroid_index(text);
+	if (idx < 0)
+		return;
+
+	asteroid_load(idx, 0);
+}
+
 // Goober5000
 void preload_turret_change_weapon(const char *text)
 {
@@ -4846,6 +4872,30 @@ int get_sexp()
 				do_preload_for_arguments(sexp_set_skybox_model_preload, n, arg_handler);
 				break;
 
+			case OP_CONFIG_ASTEROID_FIELD:
+				// asteroid types start at argument #17
+				n = CDDDDDR(start);
+				n = CDDDDDR(n);
+				n = CDDDDDR(n);
+				n = CDDR(n);
+
+				// loop through all remaining arguments
+				for (int arg = n; arg >= 0; arg = CDR(arg)) {
+					do_preload_for_arguments(preload_asteroid_class, arg, arg_handler);
+				}
+				break;
+
+			case OP_CONFIG_DEBRIS_FIELD:
+				// debris types start at argument #10
+				n = CDDDDDR(start);
+				n = CDDDDDR(n);
+				
+				// loop through all remaining arguments
+				for (int arg = n; arg >= 0; arg = CDR(arg)) {
+					do_preload_for_arguments(preload_debris_class, arg, arg_handler);
+				}
+				break;
+
 			case OP_TURRET_CHANGE_WEAPON:
 				// weapon to change to is arg #3
 				n = CDDDR(start);