diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 65a9fbcb5..16fd0057a 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -1455,6 +1455,16 @@ static int32_t check_repeat_report(vector &results) } return 0; } + +static bool add_proper_report(df::unit *unit, bool is_sparring, int report_index) +{ + if (is_sparring) + return Gui::addCombatReport(unit, unit_report_type::Sparring, report_index); + else if (unit->job.current_job != NULL && unit->job.current_job->job_type == job_type::Hunt) + return Gui::addCombatReport(unit, unit_report_type::Hunting, report_index); + else + return Gui::addCombatReport(unit, unit_report_type::Combat, report_index); +} // End of utility functions for reports DFHACK_EXPORT int Gui::makeAnnouncement(df::announcement_type type, df::announcement_flags flags, df::coord pos, std::string message, int color, bool bright) @@ -1587,17 +1597,6 @@ bool Gui::addCombatReport(df::unit *unit, df::unit_report_type slot, int report_ return true; } -// An additional utility function for reports -static bool add_proper_report(df::unit *unit, bool is_sparring, int report_index) -{ - if (is_sparring) - return Gui::addCombatReport(unit, unit_report_type::Sparring, report_index); - else if (unit->job.current_job != NULL && unit->job.current_job->job_type == job_type::Hunt) - return Gui::addCombatReport(unit, unit_report_type::Hunting, report_index); - else - return Gui::addCombatReport(unit, unit_report_type::Combat, report_index); -} - bool Gui::addCombatReportAuto(df::unit *unit, df::announcement_flags mode, int report_index) { using df::global::world;