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

attempt to fix build errors on gcc-4.8

develop
Myk Taylor 2020-10-06 08:24:59 -07:00
parent efd68a3bc9
commit 0edebd7e1f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/buildingplan-planner.cpp
Unescape Escape View File

@ -1,3 +1,5 @@
#include <functional>
#include "df/building_design.h" #include "df/building_design.h"
#include "df/building_doorst.h" #include "df/building_doorst.h"
#include "df/building_type.h" #include "df/building_type.h"
@ -244,8 +246,8 @@ static size_t getNumFilters(BuildingTypeKey key)
} }
PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters) PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
: building_id(building->id), : building(building),
building(building), building_id(building->id),
filters(filters) filters(filters)
{ {
config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1); config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
@ -256,8 +258,8 @@ PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemF
PlannedBuilding::PlannedBuilding(PersistentDataItem &config) PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
: config(config), : config(config),
building_id(config.ival(1)),
building(df::building::find(config.ival(1))), building(df::building::find(config.ival(1))),
building_id(config.ival(1)),
filters(deserializeFilters(config)) filters(deserializeFilters(config))
{ } { }