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

Convert uses of fabs to std::fabs

Browse source
This commit is contained in:
Charles Dang 2016-11-07 11:00:00 +11:00
parent 5da9b18f4c
commit 1167bc3c3c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/attack_prediction.cpp
View file

@ -2055,13 +2055,13 @@ void combatant::fight(combatant &opp, bool levelup_considered)
assert(summary[0].size() == res.size());
assert(opp.summary[0].size() == opp_res.size());
for (unsigned int i = 0; i < summary[0].size(); ++i) {
if (fabs(summary[0][i] - res[i]) > 0.000001) {
if (std::fabs(summary[0][i] - res[i]) > 0.000001) {
std::cerr << "Mismatch for " << i << " hp: " << summary[0][i] << " should have been " << res[i] << "\n";
assert(0);
}
}
for (unsigned int i = 0; i < opp.summary[0].size(); ++i) {
if (fabs(opp.summary[0][i] - opp_res[i])> 0.000001) {
if (std::fabs(opp.summary[0][i] - opp_res[i])> 0.000001) {
std::cerr << "Mismatch for " << i << " hp: " << opp.summary[0][i] << " should have been " << opp_res[i] << "\n";
assert(0);
}

4
src/controller_base.cpp
View file

@ -182,8 +182,8 @@ bool controller_base::handle_scroll(int mousex, int mousey, int mouse_flags, dou
const double x_diff = (mousex - original_loc.x);
const double y_diff = (mousey - original_loc.y);
if (fabs(x_diff) > snap_dist || fabs(y_diff) <= snap_dist) dx += speed * x_diff;
if (fabs(y_diff) > snap_dist || fabs(x_diff) <= snap_dist) dy += speed * y_diff;
if (std::fabs(x_diff) > snap_dist || std::fabs(y_diff) <= snap_dist) dx += speed * x_diff;
if (std::fabs(y_diff) > snap_dist || std::fabs(x_diff) <= snap_dist) dy += speed * y_diff;
}
}
else { // Event may fire mouse down out of order with respect to initial click