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

Merge pull request #1188 from BenLubar/labormanager-culture-crash 

Fix labormanager crash when a dwarf doesn't have a cultural identity
develop
Lethosor 2017-11-23 16:22:44 -05:00 committed by GitHub
parent c546e5e52c e06644cdf4
commit c8cd2f40bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/labormanager/labormanager.cpp
Unescape Escape View File

@ -1175,6 +1175,8 @@ private:
void collect_dwarf_list() void collect_dwarf_list()
{ {
state_count.clear();
state_count.resize(NUM_STATE);
for (auto u = world->units.active.begin(); u != world->units.active.end(); ++u) for (auto u = world->units.active.begin(); u != world->units.active.end(); ++u)
{ {
@ -1373,6 +1375,8 @@ private:
if (print_debug) if (print_debug)
out.print("Dwarf \"%s\": state %s %d\n", dwarf->dwarf->name.first_name.c_str(), state_names[dwarf->state], dwarf->clear_all); out.print("Dwarf \"%s\": state %s %d\n", dwarf->dwarf->name.first_name.c_str(), state_names[dwarf->state], dwarf->clear_all);
state_count[dwarf->state]++;
// determine if dwarf has medical needs // determine if dwarf has medical needs
if (dwarf->dwarf->health && !( if (dwarf->dwarf->health && !(
// on-duty military will not necessarily break to get minor injuries attended // on-duty military will not necessarily break to get minor injuries attended
@ -1516,11 +1520,12 @@ private:
if (labor == df::unit_labor::CUTWOOD) if (labor == df::unit_labor::CUTWOOD)
{ {
auto c_id = d->dwarf->cultural_identity; if (auto culture = df::cultural_identity::find(d->dwarf->cultural_identity))
auto culture = world->cultural_identities.all[c_id]; {
auto ethics = culture->ethic[df::ethic_type::KILL_PLANT]; auto ethics = culture->ethic[df::ethic_type::KILL_PLANT];
if (ethics != df::ethic_response::NOT_APPLICABLE && ethics != df::ethic_response::REQUIRED) if (ethics != df::ethic_response::NOT_APPLICABLE && ethics != df::ethic_response::REQUIRED)
score += 10000 * (df::ethic_response::ACCEPTABLE - ethics); score += 10000 * (df::ethic_response::ACCEPTABLE - ethics);
}
} }
score -= Units::computeMovementSpeed(d->dwarf); score -= Units::computeMovementSpeed(d->dwarf);