MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring embark-assistant survey, 5.iteration 

- survey.cpp: replacing repeated nested vector access with a const mid_level_tile reference in survey_mid_level_tile
develop
bseiller 2021-02-01 00:24:56 +01:00
parent 16438c59c8
commit 3181532bf2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/embark-assistant/survey.cpp
Unescape Escape View File

@ -1298,20 +1298,20 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
tile.max_river_size = mid_level_tile.river_size;
}
if (i < 15 &&
mlt->at(i + 1).at(k).river_size != embark_assist::defs::river_sizes::None &&
abs (mid_level_tile.river_elevation - mlt->at(i + 1).at(k).river_elevation) >
tile.max_waterfall) {
tile.max_waterfall =
abs(mid_level_tile.river_elevation - mlt->at(i + 1).at(k).river_elevation);
if (i < 15) {
const embark_assist::defs::mid_level_tile &eastern_neighbour = mlt->at(i + 1).at(k);
if (eastern_neighbour.river_size != embark_assist::defs::river_sizes::None &&
abs(mid_level_tile.river_elevation - eastern_neighbour.river_elevation) > tile.max_waterfall) {
tile.max_waterfall = abs(mid_level_tile.river_elevation - eastern_neighbour.river_elevation);
}
}
if (k < 15 &&
mlt->at(i).at(k + 1).river_size != embark_assist::defs::river_sizes::None &&
abs(mid_level_tile.river_elevation - mlt->at(i).at(k + 1).river_elevation) >
tile.max_waterfall) {
tile.max_waterfall =
abs(mid_level_tile.river_elevation - mlt->at(i).at(k + 1).river_elevation);
if (k < 15) {
const embark_assist::defs::mid_level_tile &southern_neighbour = mlt->at(i).at(k + 1);
if (southern_neighbour.river_size != embark_assist::defs::river_sizes::None &&
abs(mid_level_tile.river_elevation - southern_neighbour.river_elevation) > tile.max_waterfall) {
tile.max_waterfall = abs(mid_level_tile.river_elevation - southern_neighbour.river_elevation);
}
}
}