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

use static instead of anon namespace; suggested changes

develop
Ryan Williams 2022-05-30 13:51:24 -07:00 committed by GitHub
parent 1c3ea000e1
commit 0ff0d272b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/modules/Gui.h
Unescape Escape View File

@ -140,7 +140,7 @@ namespace DFHack
// Recenter the viewscreen, based on DF code for announcements and scrolling // Recenter the viewscreen, based on DF code for announcements and scrolling
DFHACK_EXPORT void pauseRecenter(int32_t x, int32_t y, int32_t z, bool pause); DFHACK_EXPORT void pauseRecenter(int32_t x, int32_t y, int32_t z, bool pause);
DFHACK_EXPORT inline void pauseRecenter(df::coord pos, bool pause) { return pauseRecenter(pos.x, pos.y, pos.z, pause); } DFHACK_EXPORT inline void pauseRecenter(df::coord pos, bool pause) { pauseRecenter(pos.x, pos.y, pos.z, pause); }
DFHACK_EXPORT void recenterViewscreen(int32_t x, int32_t y, int32_t z, df::report_zoom_type zoom = df::enums::report_zoom_type::Item); DFHACK_EXPORT void recenterViewscreen(int32_t x, int32_t y, int32_t z, df::report_zoom_type zoom = df::enums::report_zoom_type::Item);
DFHACK_EXPORT inline void recenterViewscreen(df::coord pos, df::report_zoom_type zoom = df::enums::report_zoom_type::Item) { recenterViewscreen(pos.x, pos.y, pos.z, zoom); }; DFHACK_EXPORT inline void recenterViewscreen(df::coord pos, df::report_zoom_type zoom = df::enums::report_zoom_type::Item) { recenterViewscreen(pos.x, pos.y, pos.z, zoom); };
DFHACK_EXPORT inline void recenterViewscreen(df::report_zoom_type zoom = df::enums::report_zoom_type::Item) { recenterViewscreen(getCursorPos(), zoom); }; DFHACK_EXPORT inline void recenterViewscreen(df::report_zoom_type zoom = df::enums::report_zoom_type::Item) { recenterViewscreen(getCursorPos(), zoom); };

151
library/modules/Gui.cpp
Unescape Escape View File

@ -1368,99 +1368,94 @@ DFHACK_EXPORT void Gui::writeToGamelog(std::string message)
fseed.close(); fseed.close();
} }
namespace // Utility functions for reports
{ // Utility functions for reports static bool parseReportString(std::vector<std::string> *out, const std::string &str, size_t line_length = 73)
bool parseReportString(std::vector<std::string> *out, const std::string &str, size_t line_length = 73) { // parse a string into output strings like DF does for reports
{ // parse a string into output strings like DF does for reports if (str.empty() || line_length == 0)
if (str.empty() || line_length == 0) return false;
return false;
string parsed; string parsed;
size_t i = 0; size_t i = 0;
do do
{
if (str[i] == '&') // escape character
{ {
if (str[i] == '&') // escape character i++; // ignore the '&' itself
{ if (i >= str.length())
i++; // ignore the '&' itself break;
if (i >= str.length())
break;
if (str[i] == 'r') // "&r" adds a blank line if (str[i] == 'r') // "&r" adds a blank line
{ {
word_wrap(out, parsed, line_length, false/*, true*/); word_wrap(out, parsed, line_length/*, WSMODE_TRIM_LEADING*/);
out->push_back(" "); // DF adds a line with a space for some reason out->push_back(" "); // DF adds a line with a space for some reason
parsed.clear(); parsed.clear();
}
else if (str[i] == '&') // "&&" is '&'
parsed.push_back('&');
// else next char is ignored
} }
else else if (str[i] == '&') // "&&" is '&'
parsed.push_back(str[i]); parsed.push_back('&');
// else next char is ignored
} }
while (++i < str.length()); else
parsed.push_back(str[i]);
}
while (++i < str.length());
if (parsed.length()) if (parsed.length())
word_wrap(out, parsed, line_length, false/*, true*/); word_wrap(out, parsed, line_length/*, WSMODE_TRIM_LEADING*/);
return true; return true;
} }
bool recent_report(df::unit *unit, df::unit_report_type slot) static bool recent_report(df::unit *unit, df::unit_report_type slot)
{
return unit && !unit->reports.log[slot].empty() &&
*df::global::cur_year == unit->reports.last_year[slot] &&
(*df::global::cur_year_tick - unit->reports.last_year_tick[slot]) <= 500;
}
static bool recent_report_any(df::unit *unit)
{
FOR_ENUM_ITEMS(unit_report_type, slot)
{ {
if (unit && !unit->reports.log[slot].empty() && if (recent_report(unit, slot))
*df::global::cur_year == unit->reports.last_year[slot] &&
(*df::global::cur_year_tick - unit->reports.last_year_tick[slot]) <= 500)
{
return true; return true;
}
return false;
} }
return false;
}
bool recent_report_any(df::unit *unit) static void delete_old_reports()
{
auto &reports = world->status.reports;
while (reports.size() > 3000)
{ {
FOR_ENUM_ITEMS(unit_report_type, slot) if (reports[0] != NULL)
{ {
if (recent_report(unit, slot)) if (reports[0]->flags.bits.announcement)
return true; erase_from_vector(world->status.announcements, &df::report::id, reports[0]->id);
delete reports[0];
} }
return false; reports.erase(reports.begin());
} }
}
void delete_old_reports() static int32_t check_repeat_report(vector<string> &results)
{ // returns the new repeat count, else 0
if (*gamemode == game_mode::DWARF && !results.empty() && world->status.reports.size() >= results.size())
{ {
auto &reports = world->status.reports; auto &reports = world->status.reports;
while (reports.size() > 3000) size_t base = reports.size() - results.size(); // index where a repeat would start
{ size_t offset = 0;
if (reports[0] != NULL) while (reports[base + offset]->text == results[offset] && ++offset < results.size()); // match each report
{
if (reports[0]->flags.bits.announcement)
erase_from_vector(world->status.announcements, &df::report::id, reports[0]->id);
delete reports[0];
}
reports.erase(reports.begin());
}
}
int32_t check_repeat_report(vector<string> &results) if (offset == results.size()) // all lines matched
{ // returns the new repeat count, else 0
if (*gamemode == game_mode::DWARF && !results.empty() && world->status.reports.size() >= results.size())
{ {
auto &reports = world->status.reports; reports[base]->duration = 100;
size_t base = reports.size() - results.size(); // index where a repeat would start return ++(reports[base]->repeat_count);
size_t offset = 0;
while (reports[base + offset]->text == results[offset] && ++offset < results.size()); // match each report
if (offset == results.size()) // all lines matched
{
reports[base]->duration = 100;
return ++(reports[base]->repeat_count);
}
} }
return 0;
} }
return 0;
} }
// 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) DFHACK_EXPORT int Gui::makeAnnouncement(df::announcement_type type, df::announcement_flags flags, df::coord pos, std::string message, int color, bool bright)
{ {
@ -1592,17 +1587,15 @@ bool Gui::addCombatReport(df::unit *unit, df::unit_report_type slot, int report_
return true; return true;
} }
namespace // An additional utility function for reports
{ // An additional utility function for reports static bool add_proper_report(df::unit *unit, bool is_sparring, int report_index)
bool add_proper_report(df::unit *unit, bool is_sparring, int report_index) {
{ if (is_sparring)
if (is_sparring) return Gui::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)
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);
return Gui::addCombatReport(unit, unit_report_type::Hunting, report_index); else
else return Gui::addCombatReport(unit, unit_report_type::Combat, report_index);
return Gui::addCombatReport(unit, unit_report_type::Combat, report_index);
}
} }
bool Gui::addCombatReportAuto(df::unit *unit, df::announcement_flags mode, int report_index) bool Gui::addCombatReportAuto(df::unit *unit, df::announcement_flags mode, int report_index)