Skip to content

Commit f92bc15

Browse files
authored
Merge pull request scp-fs2open#6941 from Goober5000/6882_followup
restore inadvertently deleted code
2 parents 59a362e + dde16a5 commit f92bc15

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

code/ship/shiphit.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3080,6 +3080,11 @@ void ship_apply_global_damage(object *ship_objp, object *other_obj, const vec3d
30803080
// shield_quad = quadrant facing the force_center
30813081
shield_quad = get_quadrant(&local_hitpos, ship_objp);
30823082

3083+
// world_hitpos use force_center for shockwave
3084+
// Goober5000 check for NULL
3085+
if (other_obj && (other_obj->type == OBJ_SHOCKWAVE) && (Ship_info[Ships[ship_objp->instance].ship_info_index].is_huge_ship()))
3086+
world_hitpos = *force_center;
3087+
30833088
int wip_index = -1;
30843089
if(other_obj != nullptr && other_obj->type == OBJ_SHOCKWAVE)
30853090
wip_index = shockwave_get_weapon_index(other_obj->instance);

0 commit comments

Comments
 (0)