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

Update labormanager for unit.relations removal and fix warnings

develop
lethosor 2016-08-11 23:42:58 -04:00
parent bceeea39ba
commit 99813038e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/devel/labormanager.cpp
Unescape Escape View File

@ -28,6 +28,7 @@
#include <df/ui.h> #include <df/ui.h>
#include <df/world.h> #include <df/world.h>
#include <df/unit.h> #include <df/unit.h>
#include <df/unit_relationship_type.h>
#include <df/unit_soul.h> #include <df/unit_soul.h>
#include <df/unit_labor.h> #include <df/unit_labor.h>
#include <df/unit_skill.h> #include <df/unit_skill.h>
@ -687,7 +688,7 @@ static df::unit_labor construction_build_labor (df::item* i)
color_ostream* debug_stream; color_ostream* debug_stream;
void debug (char* fmt, ...) void debug (const char* fmt, ...)
{ {
if (debug_stream) if (debug_stream)
{ {
@ -1924,7 +1925,7 @@ private:
for (auto u2 = world->units.active.begin(); u2 != world->units.active.end(); ++u2) 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)->flags1.bits.dead &&
((*u2)->profession == df::profession::CHILD || (*u2)->profession == df::profession::BABY)) ((*u2)->profession == df::profession::CHILD || (*u2)->profession == df::profession::BABY))
{ {