Skip to content

Commit

Permalink
Merge pull request scp-fs2open#5970 from Goober5000/sexp_exited_refin…
Browse files Browse the repository at this point in the history 
…ement

be mindful of death rolls when checking for ship stats
  • Loading branch information
@JohnAFernandez
JohnAFernandez committed Feb 4, 2024
2 parents f7df03c + ab319a6 commit bad255f
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions code/parse/sexp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7701,7 +7701,7 @@ int sexp_special_warp_dist( int n)
// ships which aren't present get NAN
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto shipp = ship_entry->shipp();
Expand Down Expand Up @@ -7966,7 +7966,7 @@ int sexp_get_energy_pct (int node, int op_num)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;
auto shipp = ship_entry->shipp();
auto sip = &Ship_info[shipp->ship_info_index];
Expand Down Expand Up @@ -7999,7 +7999,7 @@ int sexp_shields_left(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

// Goober5000: in case ship has no shields
Expand All @@ -8024,7 +8024,7 @@ int sexp_hits_left(int node, bool sim_hull)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto objp = ship_entry->objp();
Expand Down Expand Up @@ -8129,7 +8129,7 @@ int sexp_hits_left_subsystem(int n)
auto ship_entry = eval_ship(n);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto subsys_name = CTEXT(CDR(n));
Expand Down Expand Up @@ -8177,7 +8177,7 @@ int sexp_hits_left_subsystem_generic(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto subsys_type_name = CTEXT(CDR(node));
Expand Down Expand Up @@ -8214,7 +8214,7 @@ int sexp_hits_left_subsystem_specific(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto subsys_name = CTEXT(CDR(node));
Expand Down Expand Up @@ -19800,7 +19800,7 @@ int sexp_gse_recharge_pct(int node, int op_num)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
else if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

int index;
Expand All @@ -19824,11 +19824,10 @@ int sexp_get_power_output(int node)
{
auto ship_entry = eval_ship(node);

if (ship_entry == nullptr || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

if (ship_entry->status == ShipStatus::NOT_YET_PRESENT)
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

return (int)(std::lround(Ship_info[ship_entry->shipp()->ship_info_index].power_output));
}
Expand All @@ -19845,7 +19844,7 @@ int sexp_get_ets_value(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
else if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

if (!stricmp(ets_type, "engine")) {
Expand Down Expand Up @@ -19920,7 +19919,7 @@ int sexp_shield_quad_low(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

auto sip = &Ship_info[ship_entry->shipp()->ship_info_index];
Expand Down Expand Up @@ -20006,7 +20005,7 @@ int sexp_get_ammo(int node, bool for_turret, bool primary, bool do_percent)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;
node = CDR(node);

Expand Down Expand Up @@ -20320,7 +20319,7 @@ int sexp_get_countermeasures(int node)
auto ship_entry = eval_ship(node);
if (!ship_entry || ship_entry->status == ShipStatus::NOT_YET_PRESENT)
return SEXP_NAN;
if (ship_entry->status == ShipStatus::EXITED)
if (ship_entry->status == ShipStatus::DEATH_ROLL || ship_entry->status == ShipStatus::EXITED)
return SEXP_NAN_FOREVER;

return ship_entry->shipp()->cmeasure_count;
Expand Down

0 comments on commit bad255f

Please sign in to comment.