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

Merge branch 'develop' into develop

develop
silverflyone 2023-02-16 15:05:23 +11:00 committed by GitHub
parent 648af1c81c 82cc486442
commit 3ad66d5c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 8e60e1c8e2de56882ab79dad008734b98a62e861 Subproject commit 7639896c68508d968c36d00bd165bbd513171048

4
plugins/autolabor/autolabor.cpp
Unescape Escape View File

@ -835,8 +835,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
for (auto& act : plotinfo->activities) for (auto& act : plotinfo->activities)
{ {
if (!act) continue; if (!act) continue;
bool p1 = act->unit_actor == dwarfs[dwarf]; bool p1 = act->unit_actor == dwarfs[dwarf]->id;
bool p2 = act->unit_noble == dwarfs[dwarf]; bool p2 = act->unit_noble == dwarfs[dwarf]->id;
if (p1 || p2) if (p1 || p2)
{ {

2
scripts

@ -1 +1 @@
Subproject commit b13f351b22de50210b9b71d34806ebc2b84351ca Subproject commit 9b6340be8044989d562c19d7b8bd64dbf4af5e88