Skip to content

Commit

Permalink
fix set max capacity ship part meter (#3830) (#3834)
Browse files Browse the repository at this point in the history
* Pass ShipPartMeter as pointer, as NewMeterValue uses GetMeter instead of GetPartMeter
* Pass Meter as pointer to NewMeterValue
  • Loading branch information
agrrr3 committed May 12, 2022
1 parent 3abfde4 commit e6b4f94
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions universe/Effects.cpp
Expand Up @@ -651,7 +651,7 @@ void SetMeter::Execute(ScriptingContext& context,
for (auto& target : targets) {
if (Meter* meter = target->GetMeter(m_meter))
target_new_meter_vals.emplace_back(
NewMeterValue(context, m_meter, m_value, target).first, target->ID(), meter);
NewMeterValue(context, meter, m_value, target).first, target->ID(), meter);
}

// set new meter values and update accounting
Expand Down Expand Up @@ -887,7 +887,7 @@ void SetShipPartMeter::Execute(ScriptingContext& context, const TargetSet& targe

if (Meter* meter = ship->GetPartMeter(m_meter, part_name))
target_new_meter_vals.emplace_back(
NewMeterValue(std::move(target_context), m_meter, m_value).first,
NewMeterValue(std::move(target_context), meter, m_value).first,
target->ID(), meter);
}

Expand Down Expand Up @@ -954,7 +954,7 @@ void SetShipPartMeter::Execute(ScriptingContext& context, const TargetSet& targe
auto ship = static_cast<Ship*>(target.get());
if (Meter* meter = ship->GetPartMeter(m_meter, part_name))
target_new_meter_vals.emplace_back(
NewMeterValue(context, m_meter, m_value, target).first, target->ID(), meter);
NewMeterValue(context, meter, m_value, target).first, target->ID(), meter);
}

// set new meter values and update accounting
Expand Down

0 comments on commit e6b4f94

Please sign in to comment.