From 01d1ec11978ca52d43df8a5a25ed80a1aeb26856 Mon Sep 17 00:00:00 2001 From: niffiwan Date: Fri, 12 Jan 2018 11:41:59 +1000 Subject: [PATCH] remove duplicated lines of code --- code/object/collideshipship.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/object/collideshipship.cpp b/code/object/collideshipship.cpp index b92b1818d64..69004796254 100644 --- a/code/object/collideshipship.cpp +++ b/code/object/collideshipship.cpp @@ -1240,11 +1240,6 @@ int collide_ship_ship( obj_pair * pair ) ship_apply_local_damage(ship_ship_hit_info.heavy, ship_ship_hit_info.light, &world_hit_pos, 100.0f * damage/HeavyOne->phys_info.mass, quadrant_num, CREATE_SPARKS, ship_ship_hit_info.submodel_num, &ship_ship_hit_info.collision_normal); hud_shield_quadrant_hit(ship_ship_hit_info.heavy, quadrant_num); - quadrant_num = get_ship_quadrant_from_global(&world_hit_pos, ship_ship_hit_info.light); - if ((ship_ship_hit_info.light->flags[Object::Object_Flags::No_shields]) || !ship_is_shield_up(ship_ship_hit_info.light, quadrant_num) ) { - quadrant_num = -1; - } - // don't draw sparks (using sphere hitpos) ship_apply_local_damage(ship_ship_hit_info.light, ship_ship_hit_info.heavy, &world_hit_pos, dam2, MISS_SHIELDS, NO_SPARKS, -1, &ship_ship_hit_info.collision_normal); hud_shield_quadrant_hit(ship_ship_hit_info.light, -1);