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

Implements clang-tidy suggestions

develop
Josh Cooper 2022-04-18 19:27:15 -07:00 committed by Myk
parent 2bbe1aa6f5
commit 1f972d6c1c
1 changed files with 138 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

289
library/modules/EventManager.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ void DFHack::EventManager::unregister(EventType::EventType e, EventHandler handl
for ( auto i = handlers[e].find(plugin); i != handlers[e].end(); ) { for ( auto i = handlers[e].find(plugin); i != handlers[e].end(); ) {
if ( (*i).first != plugin ) if ( (*i).first != plugin )
break; break;
EventHandler handle = (*i).second; EventHandler &handle = (*i).second;
if ( handle != handler ) { if ( handle != handler ) {
i++; i++;
continue; continue;
@ -116,10 +116,9 @@ void DFHack::EventManager::unregisterAll(Plugin* plugin) {
removeFromTickQueue((*i).second); removeFromTickQueue((*i).second);
} }
for ( size_t a = 0; a < (size_t)EventType::EVENT_MAX; a++ ) { for (auto &handler : handlers) {
handlers[a].erase(plugin); handler.erase(plugin);
} }
return;
} }
static void manageTickEvent(color_ostream& out); static void manageTickEvent(color_ostream& out);
@ -243,13 +242,13 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
//TODO: put this somewhere else //TODO: put this somewhere else
doOnce = true; doOnce = true;
EventHandler buildingHandler(Buildings::updateBuildings, 100); EventHandler buildingHandler(Buildings::updateBuildings, 100);
DFHack::EventManager::registerListener(EventType::BUILDING, buildingHandler, NULL); DFHack::EventManager::registerListener(EventType::BUILDING, buildingHandler, nullptr);
//out.print("Registered listeners.\n %d", __LINE__); //out.print("Registered listeners.\n %d", __LINE__);
} }
if ( event == DFHack::SC_MAP_UNLOADED ) { if ( event == DFHack::SC_MAP_UNLOADED ) {
lastJobId = -1; lastJobId = -1;
for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { for (auto &prevJob : prevJobs) {
Job::deleteJobStruct((*i).second, true); Job::deleteJobStruct(prevJob.second, true);
} }
prevJobs.clear(); prevJobs.clear();
tickQueue.clear(); tickQueue.clear();
@ -264,8 +263,8 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
gameLoaded = false; gameLoaded = false;
multimap<Plugin*,EventHandler> copy(handlers[EventType::UNLOAD].begin(), handlers[EventType::UNLOAD].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::UNLOAD].begin(), handlers[EventType::UNLOAD].end());
for (auto a = copy.begin(); a != copy.end(); a++ ) { for (auto &key_value : copy) {
(*a).second.eventHandler(out, NULL); key_value.second.eventHandler(out, nullptr);
} }
} else if ( event == DFHack::SC_MAP_LOADED ) { } else if ( event == DFHack::SC_MAP_LOADED ) {
/* /*
@ -295,49 +294,44 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
lastJobId = -1 + *df::global::job_next_id; lastJobId = -1 + *df::global::job_next_id;
constructions.clear(); constructions.clear();
for ( auto i = df::global::world->constructions.begin(); i != df::global::world->constructions.end(); i++ ) { for (auto c : df::global::world->constructions) {
df::construction* constr = *i; if ( !c ) {
if ( !constr ) {
if ( Once::doOnce("EventManager.onLoad null constr") ) { if ( Once::doOnce("EventManager.onLoad null constr") ) {
out.print("EventManager.onLoad: null construction.\n"); out.print("EventManager.onLoad: null construction.\n");
} }
continue; continue;
} }
if ( constr->pos == df::coord() ) { if (c->pos == df::coord() ) {
if ( Once::doOnce("EventManager.onLoad null position of construction.\n") ) if ( Once::doOnce("EventManager.onLoad null position of construction.\n") )
out.print("EventManager.onLoad null position of construction.\n"); out.print("EventManager.onLoad null position of construction.\n");
continue; continue;
} }
constructions[constr->pos] = *constr; constructions[c->pos] = *c;
} }
for ( size_t a = 0; a < df::global::world->buildings.all.size(); a++ ) { for (auto b : df::global::world->buildings.all) {
df::building* b = df::global::world->buildings.all[a];
Buildings::updateBuildings(out, (void*)intptr_t(b->id)); Buildings::updateBuildings(out, (void*)intptr_t(b->id));
buildings.insert(b->id); buildings.insert(b->id);
} }
lastSyndromeTime = -1; lastSyndromeTime = -1;
for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { for (auto unit : df::global::world->units.all) {
df::unit* unit = df::global::world->units.all[a]; for (auto syndrome : unit->syndromes.active) {
for ( size_t b = 0; b < unit->syndromes.active.size(); b++ ) {
df::unit_syndrome* syndrome = unit->syndromes.active[b];
int32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time; int32_t startTime = syndrome->year*ticksPerYear + syndrome->year_time;
if ( startTime > lastSyndromeTime ) if ( startTime > lastSyndromeTime )
lastSyndromeTime = startTime; lastSyndromeTime = startTime;
} }
} }
lastReport = -1; lastReport = -1;
if ( df::global::world->status.reports.size() > 0 ) { if ( !df::global::world->status.reports.empty() ) {
lastReport = df::global::world->status.reports[df::global::world->status.reports.size()-1]->id; lastReport = df::global::world->status.reports[df::global::world->status.reports.size()-1]->id;
} }
lastReportUnitAttack = -1; lastReportUnitAttack = -1;
lastReportInteraction = -1; lastReportInteraction = -1;
reportToRelevantUnitsTime = -1; reportToRelevantUnitsTime = -1;
reportToRelevantUnits.clear(); reportToRelevantUnits.clear();
for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) { for (int &last_tick : eventLastTick) {
eventLastTick[a] = -1;//-1000000; last_tick = -1;//-1000000;
} }
for ( size_t a = 0; a < df::global::world->history.figures.size(); a++ ) { for (auto unit : df::global::world->history.figures) {
df::historical_figure* unit = df::global::world->history.figures[a];
if ( unit->id < 0 && unit->name.language < 0 ) if ( unit->id < 0 && unit->name.language < 0 )
unit->name.language = 0; unit->name.language = 0;
} }
@ -363,10 +357,10 @@ void DFHack::EventManager::manageEvents(color_ostream& out) {
continue; continue;
int32_t eventFrequency = -100; int32_t eventFrequency = -100;
if ( a != EventType::TICK ) if ( a != EventType::TICK )
for ( auto b = handlers[a].begin(); b != handlers[a].end(); b++ ) { for (auto &key_value : handlers[a]) {
EventHandler bob = (*b).second; EventHandler &handle = key_value.second;
if ( bob.freq < eventFrequency || eventFrequency == -100 ) if (handle.freq < eventFrequency || eventFrequency == -100 )
eventFrequency = bob.freq; eventFrequency = handle.freq;
} }
else eventFrequency = 1; else eventFrequency = 1;
@ -386,7 +380,7 @@ static void manageTickEvent(color_ostream& out) {
while ( !tickQueue.empty() ) { while ( !tickQueue.empty() ) {
if ( tick < (*tickQueue.begin()).first ) if ( tick < (*tickQueue.begin()).first )
break; break;
EventHandler handle = (*tickQueue.begin()).second; EventHandler &handle = (*tickQueue.begin()).second;
tickQueue.erase(tickQueue.begin()); tickQueue.erase(tickQueue.begin());
handle.eventHandler(out, (void*)intptr_t(tick)); handle.eventHandler(out, (void*)intptr_t(tick));
toRemove.insert(handle); toRemove.insert(handle);
@ -394,7 +388,7 @@ static void manageTickEvent(color_ostream& out) {
if ( toRemove.empty() ) if ( toRemove.empty() )
return; return;
for ( auto a = handlers[EventType::TICK].begin(); a != handlers[EventType::TICK].end(); ) { for ( auto a = handlers[EventType::TICK].begin(); a != handlers[EventType::TICK].end(); ) {
EventHandler handle = (*a).second; EventHandler &handle = (*a).second;
if ( toRemove.find(handle) == toRemove.end() ) { if ( toRemove.find(handle) == toRemove.end() ) {
a++; a++;
continue; continue;
@ -421,13 +415,14 @@ static void manageJobInitiatedEvent(color_ostream& out) {
} }
multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_INITIATED].begin(), handlers[EventType::JOB_INITIATED].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_INITIATED].begin(), handlers[EventType::JOB_INITIATED].end());
for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { for ( df::job_list_link* link = &df::global::world->jobs.list; link != nullptr; link = link->next ) {
if ( link->item == NULL ) if ( link->item == nullptr )
continue; continue;
if ( link->item->id <= lastJobId ) if ( link->item->id <= lastJobId )
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) { for (auto &key_value : copy) {
(*i).second.eventHandler(out, (void*)link->item); EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)link->item);
} }
} }
@ -444,7 +439,7 @@ static void manageJobStartedEvent(color_ostream& out) {
multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end()); multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end());
for (auto &key_value : copy) { for (auto &key_value : copy) {
auto &handler = key_value.second; auto &handler = key_value.second;
for (df::job_list_link* link = df::global::world->jobs.list.next; link != NULL; link = link->next) { for (df::job_list_link* link = df::global::world->jobs.list.next; link != nullptr; link = link->next) {
df::job* job = link->item; df::job* job = link->item;
// the jobs must have a worker to start // the jobs must have a worker to start
if (job && Job::getWorker(job) && !startedJobs.count(job->id)) { if (job && Job::getWorker(job) && !startedJobs.count(job->id)) {
@ -472,8 +467,8 @@ static void manageJobCompletedEvent(color_ostream& out) {
multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end());
map<int32_t, df::job*> nowJobs; map<int32_t, df::job*> nowJobs;
for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { for ( df::job_list_link* link = &df::global::world->jobs.list; link != nullptr; link = link->next ) {
if ( link->item == NULL ) if ( link->item == nullptr )
continue; continue;
nowJobs[link->item->id] = link->item; nowJobs[link->item->id] = link->item;
} }
@ -540,53 +535,55 @@ static void manageJobCompletedEvent(color_ostream& out) {
} }
#endif #endif
for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { for (auto &prevJob : prevJobs) {
//if it happened within a tick, must have been cancelled by the user or a plugin: not completed //if it happened within a tick, must have been cancelled by the user or a plugin: not completed
if ( tick1 <= tick0 ) if ( tick1 <= tick0 )
continue; continue;
if ( nowJobs.find((*i).first) != nowJobs.end() ) { if ( nowJobs.find(prevJob.first) != nowJobs.end() ) {
//could have just finished if it's a repeat job //could have just finished if it's a repeat job
df::job& job0 = *(*i).second; df::job& job0 = *prevJob.second;
if ( !job0.flags.bits.repeat ) if ( !job0.flags.bits.repeat )
continue; continue;
df::job& job1 = *nowJobs[(*i).first]; df::job& job1 = *nowJobs[prevJob.first];
if ( job0.completion_timer != 0 ) if ( job0.completion_timer != 0 )
continue; continue;
if ( job1.completion_timer != -1 ) if ( job1.completion_timer != -1 )
continue; continue;
//still false positive if cancelled at EXACTLY the right time, but experiments show this doesn't happen //still false positive if cancelled at EXACTLY the right time, but experiments show this doesn't happen
for ( auto j = copy.begin(); j != copy.end(); j++ ) { for (auto &key_value : copy) {
(*j).second.eventHandler(out, (void*)&job0); EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&job0);
} }
continue; continue;
} }
//recently finished or cancelled job //recently finished or cancelled job
df::job& job0 = *(*i).second; df::job& job0 = *prevJob.second;
if ( job0.flags.bits.repeat || job0.completion_timer != 0 ) if ( job0.flags.bits.repeat || job0.completion_timer != 0 )
continue; continue;
for ( auto j = copy.begin(); j != copy.end(); j++ ) { for (auto &key_value : copy) {
(*j).second.eventHandler(out, (void*)&job0); EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&job0);
} }
} }
//erase old jobs, copy over possibly altered jobs //erase old jobs, copy over possibly altered jobs
for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { for (auto &prevJob : prevJobs) {
Job::deleteJobStruct((*i).second, true); Job::deleteJobStruct(prevJob.second, true);
} }
prevJobs.clear(); prevJobs.clear();
//create new jobs //create new jobs
for ( auto j = nowJobs.begin(); j != nowJobs.end(); j++ ) { for (auto &nowJob : nowJobs) {
/*map<int32_t, df::job*>::iterator i = prevJobs.find((*j).first); /*map<int32_t, df::job*>::iterator i = prevJobs.find((*j).first);
if ( i != prevJobs.end() ) { if ( i != prevJobs.end() ) {
continue; continue;
}*/ }*/
df::job* newJob = Job::cloneJobStruct((*j).second, true); df::job* newJob = Job::cloneJobStruct(nowJob.second, true);
prevJobs[newJob->id] = newJob; prevJobs[newJob->id] = newJob;
} }
} }
@ -614,8 +611,7 @@ static void manageUnitDeathEvent(color_ostream& out) {
if (!df::global::world) if (!df::global::world)
return; return;
multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_DEATH].begin(), handlers[EventType::UNIT_DEATH].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_DEATH].begin(), handlers[EventType::UNIT_DEATH].end());
for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { for (auto unit : df::global::world->units.all) {
df::unit* unit = df::global::world->units.all[a];
//if ( unit->counters.death_id == -1 ) { //if ( unit->counters.death_id == -1 ) {
if ( Units::isActive(unit) ) { if ( Units::isActive(unit) ) {
livingUnits.insert(unit->id); livingUnits.insert(unit->id);
@ -625,8 +621,9 @@ static void manageUnitDeathEvent(color_ostream& out) {
if ( livingUnits.find(unit->id) == livingUnits.end() ) if ( livingUnits.find(unit->id) == livingUnits.end() )
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) { for (auto &key_value : copy) {
(*i).second.eventHandler(out, (void*)intptr_t(unit->id)); EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)intptr_t(unit->id));
} }
livingUnits.erase(unit->id); livingUnits.erase(unit->id);
} }
@ -661,8 +658,9 @@ static void manageItemCreationEvent(color_ostream& out) {
//spider webs don't count //spider webs don't count
if ( item->flags.bits.spider_web ) if ( item->flags.bits.spider_web )
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) { for (auto &key_value : copy) {
(*i).second.eventHandler(out, (void*)intptr_t(item->id)); EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)intptr_t(item->id));
} }
} }
nextItem = *df::global::item_next_id; nextItem = *df::global::item_next_id;
@ -687,9 +685,9 @@ static void manageBuildingEvent(color_ostream& out) {
continue; continue;
} }
buildings.insert(a); buildings.insert(a);
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler bob = (*b).second; EventHandler &handle = key_value.second;
bob.eventHandler(out, (void*)intptr_t(a)); handle.eventHandler(out, (void*)intptr_t(a));
} }
} }
nextBuilding = *df::global::building_next_id; nextBuilding = *df::global::building_next_id;
@ -703,9 +701,9 @@ static void manageBuildingEvent(color_ostream& out) {
continue; continue;
} }
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler bob = (*b).second; EventHandler &handle = key_value.second;
bob.eventHandler(out, (void*)intptr_t(id)); handle.eventHandler(out, (void*)intptr_t(id));
} }
a = buildings.erase(a); a = buildings.erase(a);
} }
@ -717,32 +715,31 @@ static void manageConstructionEvent(color_ostream& out) {
//unordered_set<df::construction*> constructionsNow(df::global::world->constructions.begin(), df::global::world->constructions.end()); //unordered_set<df::construction*> constructionsNow(df::global::world->constructions.begin(), df::global::world->constructions.end());
multimap<Plugin*,EventHandler> copy(handlers[EventType::CONSTRUCTION].begin(), handlers[EventType::CONSTRUCTION].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::CONSTRUCTION].begin(), handlers[EventType::CONSTRUCTION].end());
for ( auto a = constructions.begin(); a != constructions.end(); ) { for (auto iter = constructions.begin(); iter != constructions.end(); ) {
df::construction& construction = (*a).second; df::construction& construction = iter->second;
if ( df::construction::find(construction.pos) != NULL ) { if ( df::construction::find(construction.pos) != nullptr ) {
a++; ++iter;
continue; continue;
} }
//construction removed //construction removed
//out.print("Removed construction (%d,%d,%d)\n", construction.pos.x,construction.pos.y,construction.pos.z); //out.print("Removed construction (%d,%d,%d)\n", construction.pos.x,construction.pos.y,construction.pos.z);
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&construction); handle.eventHandler(out, (void*)&construction);
} }
a = constructions.erase(a); iter = constructions.erase(iter);
} }
//for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); a++ ) { //for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); a++ ) {
for ( auto a = df::global::world->constructions.begin(); a != df::global::world->constructions.end(); a++ ) { for (auto construction : df::global::world->constructions) {
df::construction* construction = *a; if(constructions.count(construction->pos)) {
bool b = constructions.find(construction->pos) != constructions.end();
constructions[construction->pos] = *construction;
if ( b )
continue; continue;
}
constructions[construction->pos] = *construction;
//construction created //construction created
//out.print("Created construction (%d,%d,%d)\n", construction->pos.x,construction->pos.y,construction->pos.z); //out.print("Created construction (%d,%d,%d)\n", construction->pos.x,construction->pos.y,construction->pos.z);
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)construction); handle.eventHandler(out, (void*)construction);
} }
} }
@ -753,8 +750,8 @@ static void manageSyndromeEvent(color_ostream& out) {
return; return;
multimap<Plugin*,EventHandler> copy(handlers[EventType::SYNDROME].begin(), handlers[EventType::SYNDROME].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::SYNDROME].begin(), handlers[EventType::SYNDROME].end());
int32_t highestTime = -1; int32_t highestTime = -1;
for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) { for (auto unit : df::global::world->units.all) {
df::unit* unit = *a;
/* /*
if ( unit->flags1.bits.inactive ) if ( unit->flags1.bits.inactive )
continue; continue;
@ -768,8 +765,8 @@ static void manageSyndromeEvent(color_ostream& out) {
continue; continue;
SyndromeData data(unit->id, b); SyndromeData data(unit->id, b);
for ( auto c = copy.begin(); c != copy.end(); c++ ) { for (auto &key_value : copy) {
EventHandler handle = (*c).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
@ -786,8 +783,8 @@ static void manageInvasionEvent(color_ostream& out) {
return; return;
nextInvasion = df::global::ui->invasions.next_id; nextInvasion = df::global::ui->invasions.next_id;
for ( auto a = copy.begin(); a != copy.end(); a++ ) { for (auto &key_value : copy) {
EventHandler handle = (*a).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)intptr_t(nextInvasion-1)); handle.eventHandler(out, (void*)intptr_t(nextInvasion-1));
} }
} }
@ -799,10 +796,9 @@ static void manageEquipmentEvent(color_ostream& out) {
unordered_map<int32_t, InventoryItem> itemIdToInventoryItem; unordered_map<int32_t, InventoryItem> itemIdToInventoryItem;
unordered_set<int32_t> currentlyEquipped; unordered_set<int32_t> currentlyEquipped;
for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) { for (auto unit : df::global::world->units.all) {
itemIdToInventoryItem.clear(); itemIdToInventoryItem.clear();
currentlyEquipped.clear(); currentlyEquipped.clear();
df::unit* unit = *a;
/*if ( unit->flags1.bits.inactive ) /*if ( unit->flags1.bits.inactive )
continue; continue;
*/ */
@ -817,8 +813,7 @@ static void manageEquipmentEvent(color_ostream& out) {
} }
//vector<InventoryItem>& v = (*oldEquipment).second; //vector<InventoryItem>& v = (*oldEquipment).second;
vector<InventoryItem>& v = *temp; vector<InventoryItem>& v = *temp;
for ( auto b = v.begin(); b != v.end(); b++ ) { for (auto & i : v) {
InventoryItem& i = *b;
itemIdToInventoryItem[i.itemId] = i; itemIdToInventoryItem[i.itemId] = i;
} }
for ( size_t b = 0; b < unit->inventory.size(); b++ ) { for ( size_t b = 0; b < unit->inventory.size(); b++ ) {
@ -828,9 +823,9 @@ static void manageEquipmentEvent(color_ostream& out) {
auto c = itemIdToInventoryItem.find(dfitem_new->item->id); auto c = itemIdToInventoryItem.find(dfitem_new->item->id);
if ( c == itemIdToInventoryItem.end() ) { if ( c == itemIdToInventoryItem.end() ) {
//new item equipped (probably just picked up) //new item equipped (probably just picked up)
InventoryChangeData data(unit->id, NULL, &item_new); InventoryChangeData data(unit->id, nullptr, &item_new);
for ( auto h = copy.begin(); h != copy.end(); h++ ) { for (auto &key_value : copy) {
EventHandler handle = (*h).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
continue; continue;
@ -844,20 +839,19 @@ static void manageEquipmentEvent(color_ostream& out) {
//some sort of change in how it's equipped //some sort of change in how it's equipped
InventoryChangeData data(unit->id, &item_old, &item_new); InventoryChangeData data(unit->id, &item_old, &item_new);
for ( auto h = copy.begin(); h != copy.end(); h++ ) { for (auto &key_value : copy) {
EventHandler handle = (*h).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
//check for dropped items //check for dropped items
for ( auto b = v.begin(); b != v.end(); b++ ) { for (auto i : v) {
InventoryItem i = *b;
if ( currentlyEquipped.find(i.itemId) != currentlyEquipped.end() ) if ( currentlyEquipped.find(i.itemId) != currentlyEquipped.end() )
continue; continue;
//TODO: delete ptr if invalid //TODO: delete ptr if invalid
InventoryChangeData data(unit->id, &i, NULL); InventoryChangeData data(unit->id, &i, nullptr);
for ( auto h = copy.begin(); h != copy.end(); h++ ) { for (auto &key_value : copy) {
EventHandler handle = (*h).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
@ -867,8 +861,7 @@ static void manageEquipmentEvent(color_ostream& out) {
//update equipment //update equipment
vector<InventoryItem>& equipment = equipmentLog[unit->id]; vector<InventoryItem>& equipment = equipmentLog[unit->id];
equipment.clear(); equipment.clear();
for ( size_t b = 0; b < unit->inventory.size(); b++ ) { for (auto dfitem : unit->inventory) {
df::unit_inventory_item* dfitem = unit->inventory[b];
InventoryItem item(dfitem->item->id, *dfitem); InventoryItem item(dfitem->item->id, *dfitem);
equipment.push_back(item); equipment.push_back(item);
} }
@ -882,8 +875,7 @@ static void updateReportToRelevantUnits() {
return; return;
reportToRelevantUnitsTime = df::global::world->frame_counter; reportToRelevantUnitsTime = df::global::world->frame_counter;
for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { for (auto unit : df::global::world->units.all) {
df::unit* unit = df::global::world->units.all[a];
for ( int16_t b = df::enum_traits<df::unit_report_type>::first_item_value; b <= df::enum_traits<df::unit_report_type>::last_item_value; b++ ) { for ( int16_t b = df::enum_traits<df::unit_report_type>::first_item_value; b <= df::enum_traits<df::unit_report_type>::last_item_value; b++ ) {
if ( b == df::unit_report_type::Sparring ) if ( b == df::unit_report_type::Sparring )
continue; continue;
@ -902,15 +894,15 @@ static void manageReportEvent(color_ostream& out) {
return; return;
multimap<Plugin*,EventHandler> copy(handlers[EventType::REPORT].begin(), handlers[EventType::REPORT].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::REPORT].begin(), handlers[EventType::REPORT].end());
std::vector<df::report*>& reports = df::global::world->status.reports; std::vector<df::report*>& reports = df::global::world->status.reports;
size_t a = df::report::binsearch_index(reports, lastReport, false); size_t idx = df::report::binsearch_index(reports, lastReport, false);
//this may or may not be needed: I don't know if binsearch_index goes earlier or later if it can't hit the target exactly //this may or may not be needed: I don't know if binsearch_index goes earlier or later if it can't hit the target exactly
while (a < reports.size() && reports[a]->id <= lastReport) { while (idx < reports.size() && reports[idx]->id <= lastReport) {
a++; idx++;
} }
for ( ; a < reports.size(); a++ ) { for ( ; idx < reports.size(); idx++ ) {
df::report* report = reports[a]; df::report* report = reports[idx];
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)intptr_t(report->id)); handle.eventHandler(out, (void*)intptr_t(report->id));
} }
lastReport = report->id; lastReport = report->id;
@ -918,13 +910,12 @@ static void manageReportEvent(color_ostream& out) {
} }
static df::unit_wound* getWound(df::unit* attacker, df::unit* defender) { static df::unit_wound* getWound(df::unit* attacker, df::unit* defender) {
for ( size_t a = 0; a < defender->body.wounds.size(); a++ ) { for (auto wound : defender->body.wounds) {
df::unit_wound* wound = defender->body.wounds[a];
if ( wound->age <= 1 && wound->attacker_unit_id == attacker->id ) { if ( wound->age <= 1 && wound->attacker_unit_id == attacker->id ) {
return wound; return wound;
} }
} }
return NULL; return nullptr;
} }
static void manageUnitAttackEvent(color_ostream& out) { static void manageUnitAttackEvent(color_ostream& out) {
@ -932,14 +923,14 @@ static void manageUnitAttackEvent(color_ostream& out) {
return; return;
multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_ATTACK].begin(), handlers[EventType::UNIT_ATTACK].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_ATTACK].begin(), handlers[EventType::UNIT_ATTACK].end());
std::vector<df::report*>& reports = df::global::world->status.reports; std::vector<df::report*>& reports = df::global::world->status.reports;
size_t a = df::report::binsearch_index(reports, lastReportUnitAttack, false); size_t idx = df::report::binsearch_index(reports, lastReportUnitAttack, false);
//this may or may not be needed: I don't know if binsearch_index goes earlier or later if it can't hit the target exactly //this may or may not be needed: I don't know if binsearch_index goes earlier or later if it can't hit the target exactly
while (a < reports.size() && reports[a]->id <= lastReportUnitAttack) { while (idx < reports.size() && reports[idx]->id <= lastReportUnitAttack) {
a++; idx++;
} }
std::set<int32_t> strikeReports; std::set<int32_t> strikeReports;
for ( ; a < reports.size(); a++ ) { for ( ; idx < reports.size(); idx++ ) {
df::report* report = reports[a]; df::report* report = reports[idx];
lastReportUnitAttack = report->id; lastReportUnitAttack = report->id;
if ( report->flags.bits.continuation ) if ( report->flags.bits.continuation )
continue; continue;
@ -953,8 +944,7 @@ static void manageUnitAttackEvent(color_ostream& out) {
return; return;
updateReportToRelevantUnits(); updateReportToRelevantUnits();
map<int32_t, map<int32_t, int32_t> > alreadyDone; map<int32_t, map<int32_t, int32_t> > alreadyDone;
for ( auto a = strikeReports.begin(); a != strikeReports.end(); a++ ) { for (int reportId : strikeReports) {
int32_t reportId = *a;
df::report* report = df::report::find(reportId); df::report* report = df::report::find(reportId);
if ( !report ) if ( !report )
continue; //TODO: error continue; //TODO: error
@ -967,7 +957,7 @@ static void manageUnitAttackEvent(color_ostream& out) {
break; break;
if ( !report2->flags.bits.continuation ) if ( !report2->flags.bits.continuation )
break; break;
reportStr = reportStr + report2->text; reportStr += report2->text;
} }
std::vector<int32_t>& relevantUnits = reportToRelevantUnits[report->id]; std::vector<int32_t>& relevantUnits = reportToRelevantUnits[report->id];
@ -981,52 +971,49 @@ static void manageUnitAttackEvent(color_ostream& out) {
df::unit_wound* wound1 = getWound(unit1,unit2); df::unit_wound* wound1 = getWound(unit1,unit2);
df::unit_wound* wound2 = getWound(unit2,unit1); df::unit_wound* wound2 = getWound(unit2,unit1);
UnitAttackData data{};
if ( wound1 && !alreadyDone[unit1->id][unit2->id] ) { if ( wound1 && !alreadyDone[unit1->id][unit2->id] ) {
UnitAttackData data;
data.attacker = unit1->id; data.attacker = unit1->id;
data.defender = unit2->id; data.defender = unit2->id;
data.wound = wound1->id; data.wound = wound1->id;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) { if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) {
UnitAttackData data;
data.attacker = unit2->id; data.attacker = unit2->id;
data.defender = unit1->id; data.defender = unit1->id;
data.wound = wound2->id; data.wound = wound2->id;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
if ( Units::isKilled(unit1) ) { if ( Units::isKilled(unit1) ) {
UnitAttackData data;
data.attacker = unit2->id; data.attacker = unit2->id;
data.defender = unit1->id; data.defender = unit1->id;
data.wound = -1; data.wound = -1;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
if ( Units::isKilled(unit2) ) { if ( Units::isKilled(unit2) ) {
UnitAttackData data;
data.attacker = unit1->id; data.attacker = unit1->id;
data.defender = unit2->id; data.defender = unit2->id;
data.wound = -1; data.wound = -1;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
} }
@ -1044,7 +1031,7 @@ static void manageUnitAttackEvent(color_ostream& out) {
} }
static std::string getVerb(df::unit* unit, std::string reportStr) { static std::string getVerb(df::unit* unit, std::string reportStr) {
std::string result(reportStr); std::string result(std::move(reportStr));
std::string name = unit->name.first_name + " "; std::string name = unit->name.first_name + " ";
bool match = strncmp(result.c_str(), name.c_str(), name.length()) == 0; bool match = strncmp(result.c_str(), name.c_str(), name.length()) == 0;
if ( match ) { if ( match ) {
@ -1164,15 +1151,15 @@ static InteractionData getAttacker(color_ostream& out, df::report* attackEvent,
if ( Once::doOnce("EventManager interaction ambiguous attacker") ) { if ( Once::doOnce("EventManager interaction ambiguous attacker") ) {
out.print("%s,%d: ambiguous attacker on report\n \'%s\'\n '%s'\n", __FILE__, __LINE__, attackEvent ? attackEvent->text.c_str() : "", defendEvent ? defendEvent->text.c_str() : ""); out.print("%s,%d: ambiguous attacker on report\n \'%s\'\n '%s'\n", __FILE__, __LINE__, attackEvent ? attackEvent->text.c_str() : "", defendEvent ? defendEvent->text.c_str() : "");
} }
} else if ( attackers.size() < 1 ) { } else if ( attackers.empty() ) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
if ( attackEvent && defendEvent ) if ( attackEvent && defendEvent )
return getAttacker(out, NULL, NULL, defendEvent, relevantUnits); return getAttacker(out, nullptr, nullptr, defendEvent, relevantUnits);
} else { } else {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
//attackers.size() == 1 //attackers.size() == 1
result.attacker = attackers[0]->id; result.attacker = attackers[0]->id;
if ( defenders.size() > 0 ) if ( !defenders.empty() )
result.defender = defenders[0]->id; result.defender = defenders[0]->id;
if ( defenders.size() > 1 ) { if ( defenders.size() > 1 ) {
if ( Once::doOnce("EventManager interaction ambiguous defender") ) { if ( Once::doOnce("EventManager interaction ambiguous defender") ) {
@ -1192,24 +1179,24 @@ static InteractionData getAttacker(color_ostream& out, df::report* attackEvent,
static vector<df::unit*> gatherRelevantUnits(color_ostream& out, df::report* r1, df::report* r2) { static vector<df::unit*> gatherRelevantUnits(color_ostream& out, df::report* r1, df::report* r2) {
vector<df::report*> reports; vector<df::report*> reports;
if ( r1 == r2 ) r2 = NULL; if ( r1 == r2 ) r2 = nullptr;
if ( r1 ) reports.push_back(r1); if ( r1 ) reports.push_back(r1);
if ( r2 ) reports.push_back(r2); if ( r2 ) reports.push_back(r2);
vector<df::unit*> result; vector<df::unit*> result;
unordered_set<int32_t> ids; unordered_set<int32_t> ids;
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
for ( size_t a = 0; a < reports.size(); a++ ) { for (auto report : reports) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
vector<int32_t>& units = reportToRelevantUnits[reports[a]->id]; vector<int32_t>& units = reportToRelevantUnits[report->id];
if ( units.size() > 2 ) { if ( units.size() > 2 ) {
if ( Once::doOnce("EventManager interaction too many relevant units") ) { if ( Once::doOnce("EventManager interaction too many relevant units") ) {
out.print("%s,%d: too many relevant units. On report\n \'%s\'\n", __FILE__, __LINE__, reports[a]->text.c_str()); out.print("%s,%d: too many relevant units. On report\n \'%s\'\n", __FILE__, __LINE__, report->text.c_str());
} }
} }
for ( size_t b = 0; b < units.size(); b++ ) for (int & unit_id : units)
if ( ids.find(units[b]) == ids.end() ) { if (ids.find(unit_id) == ids.end() ) {
ids.insert(units[b]); ids.insert(unit_id);
result.push_back(df::unit::find(units[b])); result.push_back(df::unit::find(unit_id));
} }
} }
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
@ -1228,8 +1215,8 @@ static void manageInteractionEvent(color_ostream& out) {
if ( a < reports.size() ) if ( a < reports.size() )
updateReportToRelevantUnits(); updateReportToRelevantUnits();
df::report* lastAttackEvent = NULL; df::report* lastAttackEvent = nullptr;
df::unit* lastAttacker = NULL; df::unit* lastAttacker = nullptr;
//df::unit* lastDefender = NULL; //df::unit* lastDefender = NULL;
unordered_map<int32_t,unordered_set<int32_t> > history; unordered_map<int32_t,unordered_set<int32_t> > history;
for ( ; a < reports.size(); a++ ) { for ( ; a < reports.size(); a++ ) {
@ -1243,11 +1230,11 @@ static void manageInteractionEvent(color_ostream& out) {
bool attack = type == df::announcement_type::INTERACTION_ACTOR; bool attack = type == df::announcement_type::INTERACTION_ACTOR;
if ( attack ) { if ( attack ) {
lastAttackEvent = report; lastAttackEvent = report;
lastAttacker = NULL; lastAttacker = nullptr;
//lastDefender = NULL; //lastDefender = NULL;
} }
vector<df::unit*> relevantUnits = gatherRelevantUnits(out, lastAttackEvent, report); vector<df::unit*> relevantUnits = gatherRelevantUnits(out, lastAttackEvent, report);
InteractionData data = getAttacker(out, lastAttackEvent, lastAttacker, attack ? NULL : report, relevantUnits); InteractionData data = getAttacker(out, lastAttackEvent, lastAttacker, attack ? nullptr : report, relevantUnits);
if ( data.attacker < 0 ) if ( data.attacker < 0 )
continue; continue;
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
@ -1255,8 +1242,8 @@ static void manageInteractionEvent(color_ostream& out) {
// continue; //lazy way of preventing duplicates // continue; //lazy way of preventing duplicates
if ( attack && a+1 < reports.size() && reports[a+1]->type == df::announcement_type::INTERACTION_TARGET ) { if ( attack && a+1 < reports.size() && reports[a+1]->type == df::announcement_type::INTERACTION_TARGET ) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
vector<df::unit*> relevants = gatherRelevantUnits(out, lastAttackEvent, reports[a+1]); vector<df::unit*> relevant_units = gatherRelevantUnits(out, lastAttackEvent, reports[a + 1]);
InteractionData data2 = getAttacker(out, lastAttackEvent, lastAttacker, reports[a+1], relevants); InteractionData data2 = getAttacker(out, lastAttackEvent, lastAttacker, reports[a+1], relevant_units);
if ( data.attacker == data2.attacker && (data.defender == -1 || data.defender == data2.defender) ) { if ( data.attacker == data2.attacker && (data.defender == -1 || data.defender == data2.defender) ) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
data = data2; data = data2;
@ -1283,8 +1270,8 @@ static void manageInteractionEvent(color_ostream& out) {
lastAttacker = df::unit::find(data.attacker); lastAttacker = df::unit::find(data.attacker);
//lastDefender = df::unit::find(data.defender); //lastDefender = df::unit::find(data.defender);
//fire event //fire event
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for (auto &key_value : copy) {
EventHandler handle = (*b).second; EventHandler &handle = key_value.second;
handle.eventHandler(out, (void*)&data); handle.eventHandler(out, (void*)&data);
} }
//TODO: deduce attacker from latest defend event first //TODO: deduce attacker from latest defend event first