check for global (#6882)

Kestrellius · web-flow · commit 8f835fe34b9d · 2025-07-30T07:52:46.000-04:00
diff --git a/code/ship/shiphit.cpp b/code/ship/shiphit.cpp
@@ -799,7 +799,7 @@ std::pair<std::optional<ConditionData>, float> do_subobj_hit_stuff(object *ship_
 					}
 				}
 				subsys->current_hits = 0.0f;
-				do_subobj_destroyed_stuff( ship_p, subsys, hitpos );
+				do_subobj_destroyed_stuff( ship_p, subsys, global_damage ? nullptr : hitpos );
 				continue;
 			} else {
 				continue;
@@ -1045,7 +1045,7 @@ std::pair<std::optional<ConditionData>, float> do_subobj_hit_stuff(object *ship_
 
 			// multiplayer clients never blow up subobj stuff on their own
 			if ( (subsystem->current_hits <= 0.0f) && !MULTIPLAYER_CLIENT) {
-				do_subobj_destroyed_stuff( ship_p, subsystem, hitpos );
+				do_subobj_destroyed_stuff( ship_p, subsystem, global_damage ? nullptr : hitpos );
 			}
 
 			if (damage_left <= 0)	{ // no more damage to distribute, so stop checking

Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,7 @@ std::pair<std::optional<ConditionData>, float> do_subobj_hit_stuff(object *ship_`
`799`	`799`	`}`
`800`	`800`	`}`
`801`	`801`	`subsys->current_hits = 0.0f;`
`802`		`- do_subobj_destroyed_stuff( ship_p, subsys, hitpos );`
	`802`	`+ do_subobj_destroyed_stuff( ship_p, subsys, global_damage ? nullptr : hitpos );`
`803`	`803`	`continue;`
`804`	`804`	`} else {`
`805`	`805`	`continue;`
`@@ -1045,7 +1045,7 @@ std::pair<std::optional<ConditionData>, float> do_subobj_hit_stuff(object *ship_`
`1045`	`1045`
`1046`	`1046`	`// multiplayer clients never blow up subobj stuff on their own`
`1047`	`1047`	`if ( (subsystem->current_hits <= 0.0f) && !MULTIPLAYER_CLIENT) {`
`1048`		`- do_subobj_destroyed_stuff( ship_p, subsystem, hitpos );`
	`1048`	`+ do_subobj_destroyed_stuff( ship_p, subsystem, global_damage ? nullptr : hitpos );`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`if (damage_left <= 0) { // no more damage to distribute, so stop checking`