From 249ed2888fcb582c91e4e21e57409a9b448de1b6 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sat, 28 May 2022 13:28:10 -0700 Subject: [PATCH] Fix scope issue --- library/modules/Gui.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index b931c22af..35c6ca8a5 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -1388,7 +1388,7 @@ namespace if (str[i] == 'r') // "&r" adds a blank line { - word_wrap(out, parsed, line_length, false, true); + word_wrap(out, parsed, line_length, false/*, true*/); out->push_back(" "); // DF adds a line with a space for some reason parsed.clear(); } @@ -1402,7 +1402,7 @@ namespace while (++i < str.length()); if (parsed.length()) - word_wrap(out, parsed, line_length, false, true); + word_wrap(out, parsed, line_length, false/*, true*/); return true; } @@ -1597,11 +1597,11 @@ namespace bool add_proper_report(df::unit *unit, bool is_sparring, int report_index) { if (is_sparring) - return addCombatReport(unit, unit_report_type::Sparring, report_index); + 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 addCombatReport(unit, unit_report_type::Hunting, report_index); + return Gui::addCombatReport(unit, unit_report_type::Hunting, report_index); else - return addCombatReport(unit, unit_report_type::Combat, report_index); + return Gui::addCombatReport(unit, unit_report_type::Combat, report_index); } }