From 99813038e9e33246d2c9a4ac3cdfc526b9d0e4b1 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 11 Aug 2016 23:42:58 -0400 Subject: [PATCH] Update labormanager for unit.relations removal and fix warnings --- plugins/devel/labormanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/devel/labormanager.cpp b/plugins/devel/labormanager.cpp index 7d41c7814..e2c188d68 100644 --- a/plugins/devel/labormanager.cpp +++ b/plugins/devel/labormanager.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -687,7 +688,7 @@ static df::unit_labor construction_build_labor (df::item* i) color_ostream* debug_stream; -void debug (char* fmt, ...) +void debug (const char* fmt, ...) { if (debug_stream) { @@ -1924,7 +1925,7 @@ private: for (auto u2 = world->units.active.begin(); u2 != world->units.active.end(); ++u2) { - if ((*u2)->relations.mother_id == dwarf->dwarf->id && + if ((*u2)->relationship_ids[df::unit_relationship_type::Mother] == dwarf->dwarf->id && !(*u2)->flags1.bits.dead && ((*u2)->profession == df::profession::CHILD || (*u2)->profession == df::profession::BABY)) {