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

using mid_level_tile_incursion_base instead of mid_level_tile for incursion processing 

- matcher.cpp, survey.cpp: adapting signatures to use new struct that only contains incursion specific attributes
develop
bseiller 2021-01-18 23:50:14 +01:00
parent cc68767336
commit bdfd50cc65
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ namespace embark_assist {
void process_embark_incursion(matcher_info *result, void process_embark_incursion(matcher_info *result,
embark_assist::defs::world_tile_data *survey_results, embark_assist::defs::world_tile_data *survey_results,
embark_assist::defs::mid_level_tile *mlt, // Note this is a single tile, as opposed to most usages of this variable name. embark_assist::defs::mid_level_tile_incursion_base *mlt, // Note this is a single tile, as opposed to most usages of this variable name.
embark_assist::defs::finders *finder, embark_assist::defs::finders *finder,
int16_t elevation, int16_t elevation,
uint16_t x, uint16_t x,
@ -2699,7 +2699,7 @@ namespace embark_assist {
void merge_incursion_into_world_tile(embark_assist::defs::region_tile_datum* current, void merge_incursion_into_world_tile(embark_assist::defs::region_tile_datum* current,
embark_assist::defs::region_tile_datum* target_tile, embark_assist::defs::region_tile_datum* target_tile,
embark_assist::defs::mid_level_tile* target_mlt) { embark_assist::defs::mid_level_tile_incursion_base* target_mlt) {
df::world_data* world_data = world->world_data; df::world_data* world_data = world->world_data;
current->aquifer |= target_mlt->aquifer; current->aquifer |= target_mlt->aquifer;

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

@ -455,7 +455,7 @@ namespace embark_assist {
void process_embark_incursion(embark_assist::defs::site_infos *site_info, void process_embark_incursion(embark_assist::defs::site_infos *site_info,
embark_assist::defs::world_tile_data *survey_results, embark_assist::defs::world_tile_data *survey_results,
embark_assist::defs::mid_level_tile *mlt, // Note this is a single tile, as opposed to most usages of this variable name. embark_assist::defs::mid_level_tile_incursion_base *mlt, // Note this is a single tile, as opposed to most usages of this variable name.
int16_t elevation, int16_t elevation,
uint16_t x, uint16_t x,
uint16_t y) { uint16_t y) {