Merge pull request #4752 from myk002/myk_beta18

update names for beta18
DFHack · Jun 26, 2024 · fcd9e71 · fcd9e71
2 parents 909c905 + cca9012
commit fcd9e71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
@@ -260,7 +260,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world)
 }
 
 static bool widget_is_visible(df::widget * w) {
- return w && w->visibility_flags.bits.WIDGET_VISIBILITY_VISIBLE;
+ return w && w->visibility_flags.bits.VISIBILITY_VISIBLE;
 }
 
 static df::widget * get_visible_child(df::widget *parent) {
@@ -374,7 +374,7 @@ static void add_main_interface_focus_strings(const string &baseFocus, vector<str
  } else if (tab->name == "Work Details") {
  newFocusString += "/WORK_DETAILS";
  if (auto details = Gui::getWidget(virtual_cast<df::labor_work_details_interfacest>(tab), "Details");
- details && !details->visibility_flags.bits.WIDGET_VISIBILITY_CAN_KEY_ACTIVATE)
+ details && !details->visibility_flags.bits.CAN_KEY_ACTIVATE)
  newFocusString += "/Details";
  else
  newFocusString += "/Default";
@@ -685,7 +685,7 @@ static void add_main_interface_focus_strings(const string &baseFocus, vector<str
  newFocusString += "/ImageCreator";
  focusStrings.push_back(newFocusString);
  }
- if (game->main_interface.unit_selector.visibility_flags.bits.WIDGET_VISIBILITY_ACTIVE) {
+ if (game->main_interface.unit_selector.visibility_flags.bits.VISIBILITY_ACTIVE) {
  newFocusString = baseFocus;
  newFocusString += "/UnitSelector/";
  newFocusString += enum_item_key(game->main_interface.unit_selector.context);

diff --git a/library/xml b/library/xml
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -2528,9 +2528,9 @@ static void CopyLocalMap(df::world_data * worldData, df::world_region_details* w
  if (region_x < 0 || region_y < 0 || region_x >= 16 || region_y >= 16)
  continue;
 
- for (size_t j = 0; j < realization->face[site_x][site_y].buildings.size(); j++)
+ for (size_t j = 0; j < realization->building_map[site_x][site_y].buildings.size(); j++)
  {
- auto in_building = realization->face[site_x][site_y].buildings[j];
+ auto in_building = realization->building_map[site_x][site_y].buildings[j];
  auto out_building = outputTiles[region_x][region_y]->add_buildings();
 
  out_building->set_id(in_building->id);