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

stockpiles: remove sand_bags field 

Fixes #1013
develop
lethosor 2020-08-29 20:04:09 -04:00
parent 5aca88ef03
commit 09b018bea6
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/stockpiles/StockpileSerializer.cpp
Unescape Escape View File

@ -828,7 +828,6 @@ void StockpileSerializer::furniture_setup_other_mats()
void StockpileSerializer::write_furniture() void StockpileSerializer::write_furniture()
{ {
StockpileSettings::FurnitureSet *furniture= mBuffer.mutable_furniture(); StockpileSettings::FurnitureSet *furniture= mBuffer.mutable_furniture();
furniture->set_sand_bags ( mPile->settings.furniture.sand_bags );
// FURNITURE type // FURNITURE type
using df::enums::furniture_type::furniture_type; using df::enums::furniture_type::furniture_type;
@ -880,11 +879,6 @@ void StockpileSerializer::read_furniture()
const StockpileSettings::FurnitureSet furniture = mBuffer.furniture(); const StockpileSettings::FurnitureSet furniture = mBuffer.furniture();
debug() << "furniture:" <<endl; debug() << "furniture:" <<endl;
if ( mBuffer.furniture().has_sand_bags() )
mPile->settings.furniture.sand_bags = mBuffer.furniture().sand_bags();
else
mPile->settings.furniture.sand_bags = false;
// type // type
using df::enums::furniture_type::furniture_type; using df::enums::furniture_type::furniture_type;
df::enum_traits<furniture_type> type_traits; df::enum_traits<furniture_type> type_traits;

2
plugins/stockpiles/proto/stockpiles.proto
Unescape Escape View File

@ -39,7 +39,7 @@ message StockpileSettings {
repeated string mats = 3; repeated string mats = 3;
repeated string quality_core = 4; repeated string quality_core = 4;
repeated string quality_total = 5; repeated string quality_total = 5;
optional bool sand_bags = 6; // UNUSED: optional bool sand_bags = 6;
} }
message RefuseSet { message RefuseSet {
repeated string type = 1; repeated string type = 1;