Merge pull request #5008 from MjnMixael/asteroid_sexp_error_checks

Add missing asteroid debris argument type error checking

Author: Goober5000

code/parse/sexp.cpp

@@ -3935,6 +3935,16 @@ int check_sexp_syntax(int node, int return_type, int recursive, int *bad_node, i
 				break;
 			}
 
+			case OPF_ASTEROID_DEBRIS:
+				if (type2 != SEXP_ATOM_STRING) {
+					return SEXP_CHECK_TYPE_MISMATCH;
+				}
+
+				if (get_asteroid_position(CTEXT(node)) < 0) {
+					return SEXP_CHECK_INVALID_ASTEROID;
+				}
+				break;
+
 			case OPF_WING_FORMATION:
 				if (type2 != SEXP_ATOM_STRING) {
 					return SEXP_CHECK_TYPE_MISMATCH;
@@ -32450,6 +32460,9 @@ const char *sexp_error_message(int num)
 		case SEXP_CHECK_INVALID_SPECIAL_ARG_TYPE:
 			return "Invalid special argument type";
 
+		case SEXP_CHECK_INVALID_ASTEROID:
+			return "Invalid asteroid debris type";
+
 		case SEXP_CHECK_INVALID_WING_FORMATION:
 			return "Invalid wing formation";
 

code/parse/sexp.h

@@ -1171,6 +1171,7 @@ enum sexp_error_check
 	SEXP_CHECK_INVALID_ANY_HUD_GAUGE,
 	SEXP_CHECK_INVALID_WING_FLAG,
 	SEXP_CHECK_INVALID_WING_FORMATION,
+	SEXP_CHECK_INVALID_ASTEROID,
 };
 
 

fred2/sexp_tree.cpp

@@ -3498,6 +3498,12 @@ int sexp_tree::query_default_argument_available(int op, int i)
 			}
 			return 0;
 
+		case OPF_ASTEROID_DEBRIS:
+			if ((Asteroid_info.size() - NUM_ASTEROID_POFS) > 0) {
+				return 1;
+			}
+			return 0;
+
 		default:
 			if (!Dynamic_enums.empty()) {
 				if ((type - First_available_opf_id) < (int)Dynamic_enums.size()) {