allow props to block suns

Author: MjnMixael

code/prop/prop.cpp

@@ -626,27 +626,6 @@ void prop_render(object* obj, model_draw_list* scene)
 	model_render_queue(&render_info, scene, pip->model_num, &obj->orient, &obj->pos);
 }
 
-void spawn_test_prop()
-{
-	int prop_idx = prop_info_lookup("TestProp"); // whatever’s in your props.tbl
-	if (prop_idx < 0) {
-		mprintf(("TEST: Prop not found!\n"));
-		return;
-	}
-
-	matrix mtx = vmd_identity_matrix;
-	vec3d pos = ZERO_VECTOR;
-	pos.xyz.z = -2000.0f;
-
-	int objnum = prop_create(&mtx, &pos, prop_idx, "Test Prop");
-
-	if (objnum >= 0) {
-		mprintf(("TEST: Spawned prop '%s' at objnum %d\n", Prop_info[prop_idx].name, objnum));
-	} else {
-		mprintf(("TEST: Failed to create prop\n"));
-	}
-}
-
 void props_level_close()
 {
 	for (auto& opt_prop : Props) {

code/prop/prop.h

@@ -73,6 +73,4 @@ prop* prop_id_lookup(int id);
 
 void change_prop_type(int n, int prop_type);
 
-int prop_check_collision(object* prop_obj, object* other_obj, vec3d* hitpos, collision_info_struct* prop_hit_info);
-
-void spawn_test_prop();
+int prop_check_collision(object* prop_obj, object* other_obj, vec3d* hitpos, collision_info_struct* prop_hit_info);

code/ship/shipfx.cpp

@@ -33,6 +33,7 @@
 #include "object/objectsnd.h"
 #include "parse/parselo.h"
 #include "playerman/player.h"
+#include "prop/prop.h"
 #include "render/3d.h" // needed for View_position, which is used when playing a 3D sound
 #include "render/batching.h"
 #include "scripting/hook_api.h"
@@ -828,6 +829,30 @@ bool shipfx_eye_in_shadow( vec3d *eye_pos, object * src_obj, int light_n )
 		}
 	}
 
+	for (const auto& prop : Props) {
+		if (prop.has_value()) {
+			objp = &Objects[prop->objnum];
+			if (objp->flags[Object::Object_Flags::Should_be_dead])
+				continue;
+
+			if (src_obj != objp) {
+				vm_vec_scale_add(&rp1, &rp0, &light_dir, objp->radius * 10.0f);
+
+				mc.model_instance_num = prop->model_instance_num;
+				mc.model_num = Prop_info[prop->prop_info_index].model_num;
+				mc.orient = &objp->orient;
+				mc.pos = &objp->pos;
+				mc.p0 = &rp0;
+				mc.p1 = &rp1;
+				mc.flags = MC_CHECK_MODEL;
+
+				if (model_collide(&mc)) {
+					return true;
+				}
+			}
+		}
+	}
+
 	// Check all the big hull debris pieces.
 	for (auto &db: Debris)	{
 		if ( !(db.flags[Debris_Flags::Used]) || !db.is_hull ){