Skip to content

Commit

Permalink
Merge pull request scp-fs2open#6463 from Goober5000/subsystem_flag_fix
Browse files Browse the repository at this point in the history
fix sexp_ship_deal_with_subsystem_flag()
  • Loading branch information
Goober5000 authored Dec 16, 2024
2 parents e37763f + 17706a0 commit 2456f02
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/parse/sexp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18997,15 +18997,16 @@ void sexp_ship_deal_with_subsystem_flag(int op_node, int node, Ship::Subsystem_F
return;
}
auto shipp = ship_entry->shipp();
node = CDR(node);

//replace or not
// OP_SHIP_SUBSYS_TARGETABLE/UNTARGETABLE, OP_SHIP_SUBSYS_TARGETABLE and OP_TURRET_SUBSYS_TARGET_ENABLE/DISABLE
// will have already passed us this data we don't need to set it for them.
// backward compatibility hack for older sexps
if (!((ss_flag == Ship::Subsystem_Flags::Untargetable) || (ss_flag == Ship::Subsystem_Flags::No_SS_targeting)))
{
node = CDR(node);
setit = is_sexp_true(node);
node = CDR(node);
}

//multiplayer packet start
Expand Down

0 comments on commit 2456f02

Please sign in to comment.