From ae7d933251d3fddd0e7781fd055c29709898842f Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Tue, 30 Jun 2020 00:40:55 -0500 Subject: [PATCH] now with fewer compile errors! --- events/add_hf_hf_link.cpp | 2 +- events/remove_hf_entity_link.cpp | 2 +- helpers.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/events/add_hf_hf_link.cpp b/events/add_hf_hf_link.cpp index ec4b1f6..0e0ca5b 100644 --- a/events/add_hf_hf_link.cpp +++ b/events/add_hf_hf_link.cpp @@ -2,7 +2,7 @@ #include "df/history_event_add_hf_hf_linkst.h" -static std::string spouse_name(historical_figure *hf) +static std::string spouse_name(df::historical_figure *hf) { if (hf && hf->sex == pronoun_type::she) return "wife"; diff --git a/events/remove_hf_entity_link.cpp b/events/remove_hf_entity_link.cpp index 8404e81..0697bd8 100644 --- a/events/remove_hf_entity_link.cpp +++ b/events/remove_hf_entity_link.cpp @@ -88,7 +88,7 @@ void do_event(std::ostream & s, const event_context & context, df::history_event pos = binsearch_in_vector(ent->positions.own, event->position_id); event_link(s, context, hf); s << " relinquished "; - if (auto pronoun = hf ? ENUM_ATTR(pronoun_type, posessive, hf->sex) : null) + if (auto pronoun = hf ? ENUM_ATTR(pronoun_type, posessive, hf->sex) : nullptr) s << pronoun; else s << "their"; diff --git a/helpers.h b/helpers.h index 2a969f4..4fd6ba6 100644 --- a/helpers.h +++ b/helpers.h @@ -3,6 +3,7 @@ #include #include "df/profession.h" +#include "df/pronoun_type.h" #include "df/value_type.h" namespace DFHack