Skip to content

Small fix for turret swarm stuff #6711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goober5000 merged 2 commits into from
May 13, 2025
+5 −5
Merged

Small fix for turret swarm stuff #6711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
447119e
small fix for turret swarm stuff
Baezon May 8, 2025
c085f87
clean up condition
Baezon May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/weapon/swarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ void turret_swarm_delete(int i)
void turret_swarm_set_up_info(int parent_objnum, ship_subsys *turret, const weapon_info *wip, int weapon_num, bool no_tracking_object)
{
turret_swarm_info *tsi;
object *parent_obj, *target_obj;
object *parent_obj;
ship *shipp;
int tsi_index;

Expand All @@ -334,10 +334,10 @@ void turret_swarm_set_up_info(int parent_objnum, ship_subsys *turret, const weap
Assert(parent_obj->type == OBJ_SHIP);
shipp = &Ships[parent_obj->instance];
Assert(turret->turret_enemy_objnum < MAX_OBJECTS);
if(!no_tracking_object && ((turret->turret_enemy_objnum < 0) || (turret->turret_enemy_objnum >= MAX_OBJECTS))){
if (turret->turret_enemy_objnum < 0 && !no_tracking_object)
return;
if (turret->turret_enemy_objnum >= MAX_OBJECTS)
return;
}
target_obj = &Objects[turret->turret_enemy_objnum];

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