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

Fix crash when a unit is guaranteed to level up after a battle

Browse source
This commit is contained in:
Jyrki Vesterinen 2017-05-31 21:29:21 +03:00
parent bccb5674dc
commit bc44b55cc7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/attack_prediction.cpp
View file

@ -845,11 +845,12 @@ void prob_matrix::merge_row(unsigned d_plane, unsigned s_plane, unsigned row, un
void prob_matrix::merge_rows(unsigned d_plane, unsigned s_plane, unsigned d_col)
{
auto cols_end = used_cols_[s_plane].end();
auto col_it = used_cols_[s_plane].begin();
// Exclude column zero.
auto cols_begin = std::next(used_cols_[s_plane].begin());
// Transfer the data, excluding column zero.
for(const unsigned& row : used_rows_[s_plane]) {
for(++col_it; col_it != cols_end; ++col_it) {
for(const unsigned row : used_rows_[s_plane]) {
for(auto col_it = cols_begin; col_it != cols_end; ++col_it) {
xfer(d_plane, s_plane, row, d_col, row, *col_it);
}
}