now with fewer compile errors!

BenLubar · Jun 30, 2020 · ae7d933 · ae7d933
1 parent 219c6b6
commit ae7d933
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -3,6 +3,7 @@
 #include <functional>
 
 #include "df/profession.h"
+#include "df/pronoun_type.h"
 #include "df/value_type.h"
 
 namespace DFHack