Skip to content

set ETS indexes despite power level #7498

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 1 commit into from
Jun 4, 2026
+2 −8
Merged

set ETS indexes despite power level #7498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 8 deletions code/hud/hudets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,15 +398,9 @@ void set_recharge_rates(object* obj, int shields, int weapons, int engines) {

// -------------------------------------------------------------------------------------------------
// set_default_recharge_rates() will set the charge levels for the weapons, shields and
// engines to their default levels
// engines to their default levels (regardless of whether the ship has power or an ETS)
void set_default_recharge_rates(object* obj)
{
ship* ship_p = &Ships[obj->instance];
ship_info* ship_info_p = &Ship_info[ship_p->ship_info_index];

if ( ship_info_p->power_output == 0 )
return;

int ship_properties = ets_properties(obj);

// the default charge rate depends on what systems are on each ship
Expand Down Expand Up @@ -440,7 +434,7 @@ void set_default_recharge_rates(object* obj)
break;

default:
Int3(); // if no systems, power output should be zero, and this funtion shouldn't be called
set_recharge_rates(obj, ZERO_INDEX, ZERO_INDEX, ZERO_INDEX);
break;
} // end switch
}
Expand Down
Loading