0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attack Prediction: clean up some unique_ptr usage

Browse source 
According to cppreference, this use of make_unique for array types value-initializes
the array, which here is equivalent to zero-initialization.
This commit is contained in:
Charles Dang 2024-07-13 16:32:09 -04:00
parent 43a574ac62
commit 95e81a48a6
1 changed files with 59 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/attack_prediction.cpp
View file

@ -438,10 +438,7 @@ prob_matrix::prob_matrix(unsigned int a_max,
/** Allocate a new probability array, initialized to 0. */
std::unique_ptr<double[]> prob_matrix::new_plane() const
{
const unsigned int size = rows_ * cols_;
std::unique_ptr<double[]> res(new double[size]);
std::fill_n(res.get(), size, 0);
return res;
return std::make_unique<double[]>(std::size_t{rows_ * cols_});
}
/**
@ -2090,15 +2087,29 @@ void complex_fight(attack_prediction_mode mode,
double opp_hit_unknown = 1.0; // Ditto for B
// Prepare the matrix that will do our calculations.
std::unique_ptr<combat_matrix> m;
std::unique_ptr<combat_matrix> matrix;
if(mode == attack_prediction_mode::probability_calculation) {
debug(("Using exact probability calculations.\n"));
probability_combat_matrix* pm = new probability_combat_matrix(stats.max_hp, opp_stats.max_hp, stats.hp,
opp_stats.hp, summary, opp_summary, stats.slows, opp_stats.slows,
a_damage, b_damage, a_slow_damage, b_slow_damage,
stats.drain_percent, opp_stats.drain_percent, stats.drain_constant, opp_stats.drain_constant);
m.reset(pm);
auto pm = std::make_unique<probability_combat_matrix>(
stats.max_hp,
opp_stats.max_hp,
stats.hp,
opp_stats.hp,
summary,
opp_summary,
stats.slows,
opp_stats.slows,
a_damage,
b_damage,
a_slow_damage,
b_slow_damage,
stats.drain_percent,
opp_stats.drain_percent,
stats.drain_constant,
opp_stats.drain_constant
);
do {
for(unsigned int i = 0; i < max_attacks; ++i) {
@ -2156,15 +2167,37 @@ void complex_fight(attack_prediction_mode mode,
double not_hit = pm->row_sum(plane, stats.hp) + ((plane & 2) ? 0.0 : pm->row_sum(plane | 2, stats.hp));
self_not_hit = original_self_not_hit * not_hit;
}
// Pass ownership back to the containing block
matrix = std::move(pm);
} else {
debug(("Using Monte Carlo simulation.\n"));
monte_carlo_combat_matrix* mcm = new monte_carlo_combat_matrix(stats.max_hp, opp_stats.max_hp, stats.hp,
opp_stats.hp, summary, opp_summary, stats.slows, opp_stats.slows,
a_damage, b_damage, a_slow_damage, b_slow_damage,
stats.drain_percent, opp_stats.drain_percent, stats.drain_constant, opp_stats.drain_constant, rounds,
hit_chance, opp_hit_chance, split, opp_split, initially_slowed_chance, opp_initially_slowed_chance);
m.reset(mcm);
auto mcm = std::make_unique<monte_carlo_combat_matrix>(
stats.max_hp,
opp_stats.max_hp,
stats.hp,
opp_stats.hp,
summary,
opp_summary,
stats.slows,
opp_stats.slows,
a_damage,
b_damage,
a_slow_damage,
b_slow_damage,
stats.drain_percent,
opp_stats.drain_percent,
stats.drain_constant,
opp_stats.drain_constant,
rounds,
hit_chance,
opp_hit_chance,
split,
opp_split,
initially_slowed_chance,
opp_initially_slowed_chance
);
mcm->simulate();
debug(("Combat ends:\n"));
@ -2172,32 +2205,35 @@ void complex_fight(attack_prediction_mode mode,
self_not_hit = 1.0 - mcm->get_a_hit_probability();
opp_not_hit = 1.0 - mcm->get_b_hit_probability();
// Pass ownership back to the containing block
matrix = std::move(mcm);
}
if(stats.petrifies) {
m->remove_petrify_distortion_a(stats.damage, stats.slow_damage, opp_stats.hp);
matrix->remove_petrify_distortion_a(stats.damage, stats.slow_damage, opp_stats.hp);
}
if(opp_stats.petrifies) {
m->remove_petrify_distortion_b(opp_stats.damage, opp_stats.slow_damage, stats.hp);
matrix->remove_petrify_distortion_b(opp_stats.damage, opp_stats.slow_damage, stats.hp);
}
if(levelup_considered) {
if(stats.experience + game_config::combat_xp(opp_stats.level) >= stats.max_experience) {
m->forced_levelup_a();
matrix->forced_levelup_a();
} else if(stats.experience + game_config::kill_xp(opp_stats.level) >= stats.max_experience) {
m->conditional_levelup_a();
matrix->conditional_levelup_a();
}
if(opp_stats.experience + game_config::combat_xp(stats.level) >= opp_stats.max_experience) {
m->forced_levelup_b();
matrix->forced_levelup_b();
} else if(opp_stats.experience + game_config::kill_xp(stats.level) >= opp_stats.max_experience) {
m->conditional_levelup_b();
matrix->conditional_levelup_b();
}
}
// We extract results separately, then combine.
m->extract_results(summary, opp_summary);
matrix->extract_results(summary, opp_summary);
}
/**