remove redundant check

Baezon · Baezon · commit dab9a41f4597 · 2021-01-06T17:45:32.000-05:00
diff --git a/code/weapon/weapons.cpp b/code/weapon/weapons.cpp
@@ -4093,9 +4093,8 @@ void find_homing_object(object *weapon_objp, int num)
 				continue; 
 
 			homing_object_team = obj_team(objp);
-			bool can_lock_on_ship = objp->type != OBJ_SHIP || weapon_allowed_lock_restriction_object(wip, objp);
 			bool can_attack = weapon_has_iff_restrictions(wip) || iff_x_attacks_y(wp->team, homing_object_team);
-			if (can_lock_on_ship && can_attack)
+			if (weapon_allowed_lock_restriction_object(wip, objp) && can_attack)
 			{
 				if ( objp->type == OBJ_SHIP )
                 {

Original file line number	Diff line number	Diff line change
`@@ -4093,9 +4093,8 @@ void find_homing_object(object *weapon_objp, int num)`
`4093`	`4093`	`continue;`
`4094`	`4094`
`4095`	`4095`	`homing_object_team = obj_team(objp);`
`4096`		`- bool can_lock_on_ship = objp->type != OBJ_SHIP \|\| weapon_allowed_lock_restriction_object(wip, objp);`
`4097`	`4096`	`bool can_attack = weapon_has_iff_restrictions(wip) \|\| iff_x_attacks_y(wp->team, homing_object_team);`
`4098`		`- if (can_lock_on_ship && can_attack)`
	`4097`	`+ if (weapon_allowed_lock_restriction_object(wip, objp) && can_attack)`
`4099`	`4098`	`{`
`4100`	`4099`	`if ( objp->type == OBJ_SHIP )`
`4101`	`4100`	`{`