address feedback

Author: MjnMixael

code/lab/dialogs/lab_ui.cpp

@@ -1542,7 +1542,7 @@ void LabUi::show_object_options() const
 
 			with_CollapsingHeader("Object actions")
 			{
-				if (getLabManager()->isSafeForAsteroids()) {
+				if (getLabManager()->isSafeForProps()) {
 					// No actions yet
 				}
 			}

code/lab/manager/lab_manager.cpp

@@ -752,7 +752,7 @@ void LabManager::changeDisplayedObject(LabMode mode, int info_index, int subtype
 		break;
 	case LabMode::Prop:
 		CurrentObject = prop_create(&CurrentOrientation, &CurrentPosition, CurrentClass);
-		if (isSafeForShips()) {
+		if (isSafeForProps()) {
 			ModelFilename = Prop_info[CurrentClass].pof_file;
 		}
 		break;

code/mission/missionparse.cpp

@@ -5284,7 +5284,7 @@ void post_process_path_stuff()
 // MjnMixael
 void post_process_mission_props()
 {
-	for (auto& propp : Parse_props) {
+	for (const auto& propp : Parse_props) {
 		int objnum = prop_create(&propp.orientation, &propp.position, propp.prop_info_index, propp.name);
 
 		if (objnum >= 0) {

code/model/modelrender.cpp

@@ -2933,7 +2933,7 @@ void model_render_only_glowpoint_lights(const model_render_params* interp, int m
 		objp = &Objects[objnum];
 		int tentative_num = -1;
 
-		// ADD PROP HERE
+		// TODO: Add Prop support here
 		if (objp->type == OBJ_SHIP) {
 			shipp = &Ships[objp->instance];
 			tentative_num = shipp->model_instance_num;

code/object/collideshipweapon.cpp

@@ -901,7 +901,7 @@ int collide_prop_weapon(obj_pair* pair)
 		// Note: culling ships with auto spread shields seems to waste more performance than it saves,
 		// so we're not doing that here
 		if (vm_vec_dist_squared(&prop_obj->pos, &weapon_obj->pos) < (1.2f * prop_obj->radius * prop_obj->radius)) {
-			auto [do_postproc, never_hits, collision_data] =
+			const auto& [do_postproc, never_hits, collision_data] =
                 check_inside_radius_for_big_ships(prop_obj, weapon_obj, pair);
 
             if (do_postproc) {

code/prop/prop.cpp

@@ -112,7 +112,7 @@ void parse_prop_table(const char* filename)
 
 			required_string("+Color:");
 			int rgb[3];
-			stuff_int_list(rgb, 3, RAW_INTEGER_TYPE);
+			stuff_int_list(rgb, 3, ParseLookupType::RAW_INTEGER_TYPE);
 			gr_init_color(&pc.list_color, rgb[0], rgb[1], rgb[2]);
 
 			Prop_categories.push_back(pc);
@@ -271,7 +271,7 @@ void parse_prop_table(const char* filename)
 		}
 
 		if(optional_string("$Detail distance:")) {
-			pip->num_detail_levels = (int)stuff_int_list(pip->detail_distance, MAX_PROP_DETAIL_LEVELS, RAW_INTEGER_TYPE);
+			pip->num_detail_levels = (int)stuff_int_list(pip->detail_distance, MAX_PROP_DETAIL_LEVELS, ParseLookupType::RAW_INTEGER_TYPE);
 		}
 
 		if (optional_string("$Category:")) {
@@ -423,7 +423,7 @@ void prop_init()
  * Returns object index of prop.
  * @return -1 means failed.
  */
-int prop_create(matrix* orient, vec3d* pos, int prop_type, const char* name)
+int prop_create(const matrix* orient, const vec3d* pos, int prop_type, const char* name)
 {
 	prop_info* pip;
 	prop* propp;
@@ -454,7 +454,7 @@ int prop_create(matrix* orient, vec3d* pos, int prop_type, const char* name)
 		char base_name[NAME_LENGTH];
 		char suffix[NAME_LENGTH];
 		strcpy_s(base_name, Prop_info[prop_type].name.c_str());
-		sprintf(suffix, NOX(" %d"), static_cast<int>(Props.size()));
+		sprintf(suffix, NOX(" %d"), new_id);
 
 		// start building name
 		strcpy_s(propp->prop_name, base_name);

code/prop/prop.h

@@ -34,7 +34,7 @@ typedef struct prop {
 	fix time_created;
 	float alpha_mult;
 	// glow points
-	std::deque<bool> glow_point_bank_active;
+	SCP_deque<bool> glow_point_bank_active;
 	flagset<Prop::Prop_Flags> flags;
 } prop;
 
@@ -74,7 +74,7 @@ inline int prop_info_size()
 void prop_init();
 
 // Object management
-int prop_create(matrix* orient, vec3d* pos, int prop_type, const char* name = nullptr);
+int prop_create(const matrix* orient, const vec3d* pos, int prop_type, const char* name = nullptr);
 void prop_delete(object* obj);
 void prop_render(object* obj, model_draw_list* scene);
 

code/scripting/api/libs/mission.cpp

@@ -1427,12 +1427,12 @@ ADE_FUNC(createProp,
 	"Prop handle, or invalid prop handle if prop couldn't be created")
 {
 	const char* name = nullptr;
-	int pclass       = -1;
+	int pclass       = 0;
 	matrix_h* orient = nullptr;
 	vec3d pos        = vmd_zero_vector;
 	ade_get_args(L, "|sooo", &name, l_Propclass.Get(&pclass), l_Matrix.GetPtr(&orient), l_Vector.Get(&pos));
 
-	if (Prop_info.empty()) {
+	if (!SCP_vector_inbounds(Prop_info, pclass)) {
 		return ade_set_error(L, "o", l_Prop.Set(object_h()));
 	}
 
@@ -1442,10 +1442,6 @@ ADE_FUNC(createProp,
 		real_orient = orient->GetMatrix();
 	}
 
-	if (pclass == -1) {
-		return ade_set_error(L, "o", l_Prop.Set(object_h()));
-	}
-
 	int obj_idx = prop_create(real_orient, &pos, pclass, name);
 
 	if(obj_idx >= 0) {

code/scripting/api/objs/object.cpp

@@ -107,7 +107,7 @@ ADE_FUNC(__tostring, l_Object, NULL, "Returns name of object (if any)", "string"
 			sprintf(buf, "%s beam", Weapon_info[Beams[objh->objp()->instance].weapon_info_index].name);
 			break;
 		case OBJ_PROP:
-			sprintf(buf, "%s prop", "TEMP");
+			sprintf(buf, "%s prop", Props[Objects[objh->objnum].instance]->prop_name);
 			break;
 		default:
 			sprintf(buf, "object num=%d sig=%d type=%d instance=%d", objh->objnum, objh->sig, objh->objp()->type, objh->objp()->instance);

qtfred/src/mission/management.cpp

@@ -219,8 +219,8 @@ initialize(const std::string& cfilepath, int argc, char* argv[], Editor* editor,
 	listener(SubSystem::Ships);
 	ship_init();
 
-	//listener(subsystem::Props);
-	//prop_init();
+	//listener(Subsystem::Props);
+	prop_init();
 
 	listener(SubSystem::TechroomIntel);
 	techroom_intel_init();