cleanup

Author: MjnMixael

code/object/collideshipweapon.cpp

@@ -678,88 +678,23 @@ static std::tuple<bool, bool, ship_weapon_collision_data> prop_weapon_check_coll
 	if (next_hit && hit) {
 		// find hit time
 		*next_hit = (int)(1000.0f * (mc.hit_dist * (flFrametime + time_limit) - flFrametime));
-		if (*next_hit > 0)
-			// if hit occurs outside of this frame, do not do damage 
+		if (*next_hit > 0) {
+			// if hit occurs outside of this frame, do not do damage
 			valid_hit_occurred = 1;
 			bool postproc = true;
 			bool recheck = false;
 			// most of this data is irrevelant for props but let's match it to make it easy
-			ship_weapon_collision_data cd{
-				mc,
-				-1,
-				postproc,
-				-1,
-				-1,
-				ZERO_VECTOR
-			};
+			ship_weapon_collision_data cd{mc, -1, postproc, -1, -1, ZERO_VECTOR};
 			return {postproc, recheck, cd};
-	}
-
-	if (hit)
-	{
-		/*wp->collisionInfo = new mc_info; // The weapon will free this memory later
-		*wp->collisionInfo = mc;
-
-		bool prop_override = false, weapon_override = false;
-
-		// get submodel handle if scripting needs it
-		bool has_submodel = (mc.hit_submodel >= 0);
-		scripting::api::submodel_h smh(mc.model_num, mc.hit_submodel);
-
-
-		if (scripting::hooks::OnWeaponCollision->isActive()) {
-			prop_override = scripting::hooks::OnWeaponCollision->isOverride(scripting::hooks::CollisionConditions{ {prop_objp, weapon_objp} },
-				scripting::hook_param_list(scripting::hook_param("Self", 'o', prop_objp),
-					scripting::hook_param("Object", 'o', weapon_objp),
-					scripting::hook_param("Prop", 'o', prop_objp),
-					scripting::hook_param("Weapon", 'o', weapon_objp),
-					scripting::hook_param("Hitpos", 'o', mc.hit_point_world)));
-		}
-		if (scripting::hooks::OnPropCollision->isActive()) {
-			weapon_override = scripting::hooks::OnPropCollision->isOverride(scripting::hooks::CollisionConditions{ {prop_objp, weapon_objp} },
-				scripting::hook_param_list(scripting::hook_param("Self", 'o', weapon_objp),
-					scripting::hook_param("Object", 'o', prop_objp),
-					scripting::hook_param("Prop", 'o', prop_objp),
-					scripting::hook_param("Weapon", 'o', weapon_objp),
-					scripting::hook_param("Hitpos", 'o', mc.hit_point_world),
-					scripting::hook_param("PropSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel)));
-		}
-
-		if (!prop_override && !weapon_override) {
-			weapon_hit(weapon_objp, prop_objp, &mc.hit_point_world, MISS_SHIELDS); //, &mc.hit_normal, &mc.hit_point, mc.hit_submodel); This was changed by PR 6785 and the changes were not documented
 		}
-
-		if (scripting::hooks::OnWeaponCollision->isActive() && !(weapon_override && !prop_override)) {
-			scripting::hooks::OnWeaponCollision->run(scripting::hooks::CollisionConditions{ {prop_objp, weapon_objp} },
-				scripting::hook_param_list(scripting::hook_param("Self", 'o', prop_objp),
-					scripting::hook_param("Object", 'o', weapon_objp),
-					scripting::hook_param("Prop", 'o', prop_objp),
-					scripting::hook_param("Weapon", 'o', weapon_objp),
-					scripting::hook_param("Hitpos", 'o', mc.hit_point_world)));
-		}
-		if (scripting::hooks::OnPropCollision->isActive() && !prop_override) {
-			scripting::hooks::OnPropCollision->run(scripting::hooks::CollisionConditions{ {prop_objp, weapon_objp} },
-				scripting::hook_param_list(scripting::hook_param("Self", 'o', weapon_objp),
-					scripting::hook_param("Object", 'o', prop_objp),
-					scripting::hook_param("Prop", 'o', prop_objp),
-					scripting::hook_param("Weapon", 'o', weapon_objp),
-					scripting::hook_param("Hitpos", 'o', mc.hit_point_world),
-					scripting::hook_param("PropSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel)));
-		}*/
-		valid_hit_occurred = 1;
 	}
 
+	valid_hit_occurred = hit ? 1 : 0;
+
 	bool postproc = (valid_hit_occurred != 0);
 	bool recheck = (valid_hit_occurred == 0);
 	// most of this data is irrevelant for props but let's match it to make it easy
-	ship_weapon_collision_data cd{
-		(valid_hit_occurred ? mc : mc_info{}),
-		-1,
-		postproc,
-		-1,
-		-1,
-		ZERO_VECTOR
-	};
+	ship_weapon_collision_data cd{(valid_hit_occurred ? mc : mc_info{}), -1, postproc, -1, -1, ZERO_VECTOR};
 
 	return{postproc, recheck, cd};
 }