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

handling special case of the cursor having been positioned in the lower right corner before the search 

- matcher.cpp: manually moving the cursor to the neighbouring world tile so it can be moved back and embark_update is being called when all (incursion) data has been collected

Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com>
develop
bseiller 2021-01-19 16:37:59 +01:00
parent 85fe05b723
commit 438811e108
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/embark-assistant/matcher.cpp
Unescape Escape View File

@ -3065,6 +3065,12 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
iterator->active = !(iterator->i > world->worldgen.worldgen_parms.dim_y / 16); iterator->active = !(iterator->i > world->worldgen.worldgen_parms.dim_y / 16);
if (!iterator->active) { if (!iterator->active) {
// if the cursor was positioned in the lower right corner before the search it has to be moved to a neighbouring tile manually
// to force another call to embark_update when all (incursion) data is finally collected to make sure this specific world tile is properly reevaluated
// see the embark_update() in embark-assistant
if (iterator->x == world->worldgen.worldgen_parms.dim_x - 1 && iterator->y == world->worldgen.worldgen_parms.dim_y - 1) {
embark_assist::matcher::move_cursor(iterator->x - 1, iterator->y);
}
embark_assist::matcher::move_cursor(iterator->x, iterator->y); embark_assist::matcher::move_cursor(iterator->x, iterator->y);
if (!survey_results->at(0).at(0).survey_completed) { // Every world tile has gone through preliminary survey, so add possible incursion resources to each tile. if (!survey_results->at(0).at(0).survey_completed) { // Every world tile has gone through preliminary survey, so add possible incursion resources to each tile.