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

Apply suggestions from code review

develop
Josh Cooper 2022-10-25 15:01:57 -07:00 committed by GitHub
parent 48e0b53adc
commit 9dc199dac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/spectate/spectate.cpp
Unescape Escape View File

@ -184,7 +184,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out) {
} }
} }
if (failsafe >= 10) { if (failsafe >= 10) {
out.printerr("spectate encountered a problem dismissing a popup!"); out.printerr("spectate encountered a problem dismissing a popup!\n");
} }
if (disengage_enabled && !World::ReadPauseState()) { if (disengage_enabled && !World::ReadPauseState()) {
if (our_dorf && our_dorf->id != df::global::ui->follow_unit) { if (our_dorf && our_dorf->id != df::global::ui->follow_unit) {
@ -304,15 +304,14 @@ void onTick(color_ostream& out, void* ptr) {
dwarves.push_back(unit); dwarves.push_back(unit);
} }
std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1); std::uniform_int_distribution<uint64_t> follow_any(0, dwarves.size() - 1);
// if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local) // if you're looking at a warning about a local address escaping, it means the unit* from dwarves (which aren't local)
our_dorf = dwarves[follow_any(RNG)]; our_dorf = dwarves[follow_any(RNG)];
df::global::ui->follow_unit = our_dorf->id; df::global::ui->follow_unit = our_dorf->id;
job_watched = our_dorf->job.current_job; job_watched = our_dorf->job.current_job;
following_dwarf = true; following_dwarf = true;
if (!job_watched) { if (!job_watched) {
timestamp = tick; timestamp = tick;
} }
} }
} }