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

Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop

develop
lethosor 2020-12-16 13:25:25 -05:00
parent 371314d9c3 3e3a34af99
commit de21e0cdb8
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,7 @@ namespace embark_assist {
else {
process_embark_incursion(result,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).south_row[i],
&survey_results->at(fetch_x).at(fetch_y).south_row[fetch_i],
finder,
mlt->at(i).at(k).elevation,
fetch_x,
@ -530,7 +530,7 @@ namespace embark_assist {
else {
process_embark_incursion(result,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).north_row[i],
&survey_results->at(fetch_x).at(fetch_y).north_row[fetch_i],
finder,
mlt->at(i).at(k).elevation,
fetch_x,
@ -542,7 +542,7 @@ namespace embark_assist {
if (fetch_i < 0) {
process_embark_incursion(result,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).east_column[k],
&survey_results->at(fetch_x).at(fetch_y).east_column[fetch_k],
finder,
mlt->at(i).at(k).elevation,
fetch_x,
@ -552,7 +552,7 @@ namespace embark_assist {
else if (fetch_i > 15) {
process_embark_incursion(result,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).west_column[k],
&survey_results->at(fetch_x).at(fetch_y).west_column[fetch_k],
finder,
mlt->at(i).at(k).elevation,
fetch_x,

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

@ -601,7 +601,7 @@ namespace embark_assist {
else {
process_embark_incursion(site_info,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).south_row[i],
&survey_results->at(fetch_x).at(fetch_y).south_row[fetch_i],
mlt->at(i).at(k).elevation,
fetch_x,
fetch_y);
@ -627,7 +627,7 @@ namespace embark_assist {
else {
process_embark_incursion(site_info,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).north_row[i],
&survey_results->at(fetch_x).at(fetch_y).north_row[fetch_i],
mlt->at(i).at(k).elevation,
fetch_x,
fetch_y);
@ -637,7 +637,7 @@ namespace embark_assist {
if (fetch_i < 0) {
process_embark_incursion(site_info,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).east_column[k],
&survey_results->at(fetch_x).at(fetch_y).east_column[fetch_k],
mlt->at(i).at(k).elevation,
fetch_x,
fetch_y);
@ -645,7 +645,7 @@ namespace embark_assist {
else if (fetch_i > 15) {
process_embark_incursion(site_info,
survey_results,
&survey_results->at(fetch_x).at(fetch_y).west_column[k],
&survey_results->at(fetch_x).at(fetch_y).west_column[fetch_k],
mlt->at(i).at(k).elevation,
fetch_x,
fetch_y);