Skip to content

update to canonicalized structures #4631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 3 commits into from
May 24, 2024
Merged

update to canonicalized structures #4631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c5e837
update to canonicalized structures
myk002 May 24, 2024
9a202fe
update xml ref
myk002 May 24, 2024
c331dc8
update scripts ref
myk002 May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions library/modules/Buildings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,7 +1394,7 @@ bool Buildings::deconstruct(df::building *bld)
// Assume: not used in punishment
// Assume: not used in non-own jobs
// Assume: does not affect pathfinding
bld->deconstructItems(false, false);
bld->deconstructItems(false, false, false);
// Don't clear arrows.

bld->uncategorize();
Expand Down Expand Up @@ -1605,8 +1605,7 @@ bool Buildings::isActive(df::building * building)
{
if (!isActivityZone(building))
return false;
// 8 is the value obtained by reverse engineering
return ((df::building_civzonest*)building)->is_active == 8;
return ((df::building_civzonest*)building)->spec_sub_flag.bits.active;
}

bool Buildings::isAnimalTraining(df::building * building)
Expand Down
2 changes: 1 addition & 1 deletion library/xml
Open in desktop
Submodule xml updated 5 files
+215 −186 df.art.xml
+10 −10 df.building-raws.xml
+42 −18 df.building-vectors.xml
+193 −164 df.buildings.xml
+131 −40 df.stockpile.xml
2 changes: 1 addition & 1 deletion plugins/blueprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ static const char * get_trap_str(df::building *b) {
{
std::ostringstream buf;
buf << "CS";
if (trap->use_dump) {
if (trap->track_flags.bits.use_dump) {
if (trap->dump_x_shift == 0) {
buf << "d";
if (trap->dump_y_shift > 0)
Expand Down
8 changes: 5 additions & 3 deletions plugins/stockpiles/StockpileSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ void StockpileSettingsSerializer::write_general(color_ostream& out) {

void StockpileSerializer::write_general(color_ostream& out) {
StockpileSettingsSerializer::write_general(out);
mBuffer.set_use_links_only(mPile->use_links_only);
mBuffer.set_use_links_only(mPile->stockpile_flag.bits.use_links_only);
}

void StockpileSettingsSerializer::read_general(color_ostream& out, DeserializeMode mode) {
Expand All @@ -904,10 +904,12 @@ void StockpileSettingsSerializer::read_general(color_ostream& out, DeserializeMo

void StockpileSerializer::read_general(color_ostream& out, DeserializeMode mode) {
StockpileSettingsSerializer::read_general(out, mode);
read_elem<int32_t, bool>(out, "use_links_only", mode,
bool use_links_only;
read_elem<bool, bool>(out, "use_links_only", mode,
std::bind(&StockpileSettings::has_use_links_only, mBuffer),
std::bind(&StockpileSettings::use_links_only, mBuffer),
mPile->use_links_only);
use_links_only);
mPile->stockpile_flag.bits.use_links_only = use_links_only;
}

static bool ammo_mat_is_allowed(const MaterialInfo& mi) {
Expand Down
2 changes: 1 addition & 1 deletion scripts
Open in desktop
Submodule scripts updated 5 files
+2 −2 gui/advfort.lua
+1 −1 internal/quickfort/build.lua
+1 −1 internal/quickfort/place.lua
+9 −8 internal/quickfort/zone.lua
+7 −7 trackstop.lua