Skip to content

Commit 447119e

Browse files
committed
small fix for turret swarm stuff
1 parent 2576515 commit 447119e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

code/weapon/swarm.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ void turret_swarm_set_up_info(int parent_objnum, ship_subsys *turret, const weap
337337
if(!no_tracking_object && ((turret->turret_enemy_objnum < 0) || (turret->turret_enemy_objnum >= MAX_OBJECTS))){
338338
return;
339339
}
340-
target_obj = &Objects[turret->turret_enemy_objnum];
341340

342341
// valid swarm weapon
343342
Assert(((wip->wi_flags[Weapon::Info_Flags::Swarm]) && (wip->swarm_count > 0)) || ((wip->wi_flags[Weapon::Info_Flags::Corkscrew]) && (wip->cs_num_fired > 0)));
@@ -399,7 +398,7 @@ void turret_swarm_set_up_info(int parent_objnum, ship_subsys *turret, const weap
399398
tsi->parent_objnum = parent_objnum;
400399
tsi->parent_sig = parent_obj->signature;
401400
tsi->target_objnum = turret->turret_enemy_objnum;
402-
tsi->target_sig = target_obj->signature;
401+
tsi->target_sig = turret->turret_enemy_objnum >= 0 ? Objects[turret->turret_enemy_objnum].signature : 0;
403402
tsi->turret = turret;
404403
tsi->target_subsys = turret->targeted_subsys;
405404
tsi->time_to_fire = 1; // first missile next frame

0 commit comments

Comments
 (0)