Clean up comments and finish TODOs

Author: MjnMixael

code/model/animation/modelanimation_driver.cpp

@@ -98,7 +98,6 @@ namespace animation {
 		}
 	}
 
-	// ADD PROP HERE
 	template<typename property, property ship::* property_ptr, float property::* subproperty_ptr>
 	static float get_ship_subproperty_float(polymodel_instance* pmi){
 		int objnum = get_pmi_objnum(pmi);

code/model/modelread.cpp

@@ -4925,7 +4925,7 @@ void model_get_moving_submodel_list(SCP_vector<int> &submodel_vector, const obje
 
 	int model_instance_num;
 	int model_num;
-	// ADD PROP HERE
+
 	if (objp->type == OBJ_SHIP) {
 		model_instance_num = Ships[objp->instance].model_instance_num;
 		model_num = Ship_info[Ships[objp->instance].ship_info_index].model_num;

code/model/modelrender.cpp

@@ -1330,7 +1330,6 @@ int model_render_determine_elapsed_time(int objnum, uint64_t flags)
 	if ( objnum >= 0 ) {
 		object *objp = &Objects[objnum];
 
-		// ADD PROP HERE
 		if ( objp->type == OBJ_SHIP ) {
 			return timestamp_since(Ships[objp->instance].base_texture_anim_timestamp);
 		}
@@ -1927,7 +1926,6 @@ void model_render_set_glow_points(const polymodel *pm, int objnum)
 	if ( objnum > -1 ) {
 		object *objp = &Objects[objnum];
 
-		// ADD PROP HERE
 		if ( objp != NULL && objp->type == OBJ_SHIP ) {
 			shipp = &Ships[Objects[objnum].instance];
 			sip = &Ship_info[shipp->ship_info_index];
@@ -2612,7 +2610,6 @@ void model_render_queue(const model_render_params* interp, model_draw_list* scen
 		objp = &Objects[objnum];
 		int tentative_num = -1;
 
-		// ADD PROP HERE
 		if (objp->type == OBJ_SHIP) {
 			shipp = &Ships[objp->instance];
 			tentative_num = shipp->model_instance_num;

code/nebula/neb.cpp

@@ -714,8 +714,6 @@ float neb2_get_lod_scale(int objnum)
 	ship *shipp;
 	ship_info *sip;
 
-	// ADD PROP HERE
-
 	// bogus
 	if ( (objnum < 0) 
 		|| (objnum >= MAX_OBJECTS) 
@@ -1097,7 +1095,7 @@ void neb2_get_fog_values(float *fnear, float *ffar, object *objp)
 		return;
 	}
 
-	// ADD PROP HERE
+	// Future TODO: Add fog_start_dist and fog_complete_dist to Props
 	// determine what fog index to use
 	if(objp->type == OBJ_SHIP) {
 		Assert((objp->instance >= 0) && (objp->instance < MAX_SHIPS));

code/object/collidedebrisship.cpp

@@ -24,8 +24,6 @@
 #include "ship/ship.h"
 #include "ship/shiphit.h"
 
-// Need a version of this for PROPS
-
 
 void calculate_ship_ship_collision_physics(collision_info_struct *ship_ship_hit_info);
 

code/object/collideshipweapon.cpp

@@ -29,8 +29,6 @@
 #include "ship/shiphit.h"
 #include "weapon/weapon.h"
 
-// Need a version of this for PROPS
-
 //mc, notify_ai_shield_down, shield_collision, quadrant_num, shield_tri_hit, shield_hitpoint
 using ship_weapon_collision_data = std::tuple<std::optional<mc_info>, int, bool, int, int, vec3d>;
 

code/object/objcollide.cpp

@@ -429,8 +429,6 @@ int cpls_aux(vec3d *goal_pos, object *objp2, object *objp)
 		return 0;
 }
 
-//  Maybe consider PROP here too
-
 //	Return true if objp will collide with some large object.
 //	Don't check for an object this ship is docked to.
 int collide_predict_large_ship(object *objp, float distance)

code/object/object.cpp

@@ -672,8 +672,7 @@ void obj_delete_all()
 		obj_delete(i);
 	}
 
-	// If we've removed all objects then we can safely
-	// clear the Props vector TODO maybe remove this?
+	// If we've removed all objects then we can safely clear the Props vector
 	Props.clear();
 
 	mprintf(("Cleanup: Deleted %i objects\n", counter));
@@ -1194,7 +1193,7 @@ void obj_set_flags( object *obj, const flagset<Object::Object_Flags>& new_flags
 		if ( obj->type == OBJ_OBSERVER ) {
 			return;
 		}
-		// Maybe add PROP here
+
 		// sanity checks
 		if ( (obj->type != OBJ_SHIP) || (obj->instance < 0) ) {
 			return;				// return because we really don't want to set the flag
@@ -1279,7 +1278,6 @@ void obj_move_all_pre(object *objp, float frametime)
 	case OBJ_RAW_POF:
 		break;
 	case OBJ_PROP:
-		// Handle moving submodels maybe?
 		break;
 	case OBJ_NONE:
 		Int3();
@@ -1544,7 +1542,6 @@ void obj_move_all_post(object *objp, float frametime)
 			break;
 
 		case OBJ_PROP:
-			// Not sure if anything will be needed here
 			break;
 
 		case OBJ_NONE:
@@ -1696,7 +1693,7 @@ void obj_move_all(float frametime)
 		// and look_at needs to happen last or the angle may be off by a frame)
 		model_do_intrinsic_motions(objp);
 
-		// PROP probably will need something like this
+		// Future TODO: Props will need a version of this when submodel animation support is added.
 		// For ships, we now have to make sure that all the submodel detail levels remain consistent.
 		if (objp->type == OBJ_SHIP)
 			ship_model_replicate_submodels(objp);

code/prop/prop.cpp

@@ -798,7 +798,8 @@ void prop_render(object* obj, model_draw_list* scene)
 // Draft. Props vector uses std::optional to allow for empty slots for deleted props so the indices of the remaining
 // props do not change. In long FRED sessions without saving and loading, this can lead to a lot of empty slots. However,
 // saving and loading the level will naturally compact the props vector by way of clearing and re-adding props.
-void compact_props_vector()
+// EDIT: Now that creating props will use empty prop slots, this may not be needed. Keeping it here for posterity.
+/*void compact_props_vector()
 {
 	SCP_vector<std::optional<prop>> new_props;
 	SCP_unordered_map<int, int> index_remap;
@@ -823,7 +824,7 @@ void compact_props_vector()
 			}
 		}
 	}
-}
+}*/
 
 void props_level_init() {
 	Props.clear();

code/scripting/api/objs/object.cpp

@@ -18,6 +18,7 @@
 #include "object/objcollide.h"
 #include "object/objectshield.h"
 #include "object/objectsnd.h"
+#include "prop/prop.h"
 #include "scripting/api/LuaEventCallback.h"
 #include "scripting/api/objs/color.h"
 #include "scripting/lua/LuaFunction.h"
@@ -544,7 +545,10 @@ ADE_FUNC(
 			flags = (MC_CHECK_MODEL | MC_CHECK_RAY);
 			break;
 		case OBJ_PROP:
-			// do this
+			if (Props[obj->instance].has_value()) {
+				model_num = Prop_info[Props[obj->instance].value().prop_info_index].model_num;
+				flags = (MC_CHECK_MODEL | MC_CHECK_RAY);
+			}
 			break;
 		default:
 			return ADE_RETURN_NIL;
@@ -573,7 +577,7 @@ ADE_FUNC(
 	} else if (obj->type == OBJ_ASTEROID) {
 		model_instance_num = Asteroids[obj->instance].model_instance_num;
 	} else if (obj->type == OBJ_PROP) {
-		model_instance_num = -1; // YOUR MOM
+		model_instance_num = Props[obj->instance].value().model_instance_num;
 	}
 
 	mc_info hull_check;