address feedback

Author: MjnMixael

code/parse/sexp.cpp

@@ -3951,7 +3951,7 @@ int check_sexp_syntax(int node, int return_type, int recursive, int *bad_node, i
 
 			default:
 				if (Dynamic_enums.size() > 0) {
-					if ((type - First_available_list_id) < (int)Dynamic_enums.size()) {
+					if ((type - First_available_opf_id) < (int)Dynamic_enums.size()) {
 						if (type2 != SEXP_ATOM_STRING)
 							return SEXP_CHECK_TYPE_MISMATCH;
 					} else {

code/parse/sexp.h

@@ -28,6 +28,7 @@ struct ship_obj;
 
 // Operator argument formats (data types of an argument)
 enum : int {
+	UNUSED,							// argument types need to start at 1 instead of 0
 	OPF_NONE,						// argument cannot exist at this position if it's this
 	OPF_NULL,						// no value.  Can still be used for type matching, however
 	OPF_BOOL,
@@ -133,7 +134,7 @@ enum : int {
 	OPF_WING_FORMATION,				// Goober5000 - as defined in ships.tbl
 
 	//Must always be at the end of the list
-	First_available_list_id
+	First_available_opf_id
 };
 
 struct dynamic_sexp_enum_list {

code/parse/sexp/LuaSEXP.cpp

@@ -46,7 +46,7 @@ static SCP_unordered_map<SCP_string, int> parameter_type_mapping{{ "boolean",
 														  { "ship+wing+ship_on_team+waypoint",   OPF_SHIP_WING_SHIPONTEAM_POINT },
 														  { "ship+wing+waypoint",   OPF_SHIP_WING_POINT },
 														  { "ship+wing+waypoint+none",   OPF_SHIP_WING_POINT_OR_NONE },
-														  { "enum",   First_available_list_id } };
+														  { "enum",   First_available_opf_id } };
 
 std::pair<SCP_string, int> LuaSEXP::get_parameter_type(const SCP_string& name)
 {
@@ -526,7 +526,7 @@ void LuaSEXP::parseTable() {
 		}
 
 		if ((strcmp(type.first.c_str(), "enum")) == 0) {
-			type.second = increment_list_id();
+			type.second = increment_enum_list_id();
 			required_string("+Enum Name:");
 
 			SCP_string enum_name;

code/parse/sexp/sexp_lookup.cpp

@@ -28,7 +28,7 @@ struct global_state {
 	int next_free_operator_id = First_available_operator_id;
 	int next_free_category_id = First_available_category_id;
 	int next_free_subcategory_id = First_available_subcategory_id;
-	int next_free_enum_list_id = First_available_list_id;
+	int next_free_enum_list_id = First_available_opf_id;
 };
 
 // Static initialization to avoid initialization order issues
@@ -199,7 +199,7 @@ DynamicSEXP* get_dynamic_sexp(int operator_const)
 
 	return iter->second.get();
 }
-int increment_list_id()
+int increment_enum_list_id()
 {
 	auto& global = globals();
 	return global.next_free_enum_list_id++;

code/parse/sexp/sexp_lookup.h

@@ -44,7 +44,7 @@ int get_category_of_subcategory(int subcategory_id);
  */
 int add_category(const SCP_string& name);
 
-int increment_list_id();
+int increment_enum_list_id();
 
 /**
  * @brief Dynamically add a new subcategory to the SEXP system

fred2/sexp_tree.cpp

@@ -3500,7 +3500,7 @@ int sexp_tree::query_default_argument_available(int op, int i)
 
 		default:
 			if (!Dynamic_enums.empty()) {
-				if ((type - First_available_list_id) < (int)Dynamic_enums.size()) {
+				if ((type - First_available_opf_id) < (int)Dynamic_enums.size()) {
 					return 1;
 				} else {
 					UNREACHABLE("Unhandled SEXP argument type!");
@@ -7360,7 +7360,7 @@ sexp_list_item* sexp_tree::check_for_dynamic_sexp_enum(int opf)
 {
 	sexp_list_item head;
 
-	int item = opf - First_available_list_id;
+	int item = opf - First_available_opf_id;
 
 	if (item < (int)Dynamic_enums.size()) {
 

qtfred/src/ui/widgets/sexp_tree.cpp

@@ -3321,8 +3321,8 @@ sexp_list_item* sexp_tree::get_listing_opf(int opf, int parent_node, int arg_ind
 		break;
 
 	default:
-		Int3();  // unknown OPF code
-		list = NULL;
+		// We're at the end of the list so check for any dynamic enums
+		list = check_for_dynamic_sexp_enum(opf);
 		break;
 	}
 
@@ -5128,6 +5128,25 @@ sexp_list_item *sexp_tree::get_container_multidim_modifiers(int con_data_node) c
 	return head.next;
 }
 
+sexp_list_item* sexp_tree::check_for_dynamic_sexp_enum(int opf)
+{
+	sexp_list_item head;
+
+	int item = opf - First_available_list_id;
+
+	if (item < (int)Dynamic_enums.size()) {
+
+		for (const SCP_string& enum_item : Dynamic_enums[item].list) {
+			head.add_data(enum_item.c_str());
+		}
+		return head.next;
+	} else {
+		// else if opf is invalid do this
+		UNREACHABLE("Unhandled SEXP argument type!"); // unknown OPF code
+		return nullptr;
+	}
+}
+
 // given a node's parent, check if node is eligible for being used with the special argument
 bool sexp_tree::is_node_eligible_for_special_argument(int parent_node) const
 {

qtfred/src/ui/widgets/sexp_tree.h

@@ -350,6 +350,7 @@ class sexp_tree: public QTreeWidget {
 	sexp_list_item *get_listing_opf_animation_name(int parent_node);
 	static sexp_list_item *get_listing_opf_sexp_containers(ContainerType con_type);
 	sexp_list_item *get_listing_opf_wing_formation();
+	sexp_list_item* check_for_dynamic_sexp_enum(int opf);
 
 	// container modifier options for container data nodes
 	sexp_list_item *get_container_modifiers(int con_data_node) const;