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

Revert EventManager to previous behavior, but keep new events 

Fixes #2031
develop
Josh Cooper 2022-03-29 09:42:24 -07:00 committed by GitHub
parent b1dafe3a6a
commit b18eff9ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 436 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/include/modules/EventManager.h
Unescape Escape View File

@ -22,7 +22,7 @@ namespace DFHack {
JOB_INITIATED, JOB_INITIATED,
JOB_STARTED, //has a worker JOB_STARTED, //has a worker
JOB_COMPLETED, JOB_COMPLETED,
NEW_UNIT_ACTIVE, UNIT_NEW_ACTIVE,
UNIT_DEATH, UNIT_DEATH,
ITEM_CREATED, ITEM_CREATED,
BUILDING, BUILDING,
@ -42,7 +42,6 @@ namespace DFHack {
typedef void (*callback_t)(color_ostream&, void*); //called when the event happens typedef void (*callback_t)(color_ostream&, void*); //called when the event happens
callback_t eventHandler; callback_t eventHandler;
int32_t freq; //how often event is allowed to fire (in ticks) use 0 to always fire when possible int32_t freq; //how often event is allowed to fire (in ticks) use 0 to always fire when possible
int32_t when; //when to fire event (global tick count)
EventHandler(callback_t eventHandlerIn, int32_t freqIn): eventHandler(eventHandlerIn), freq(freqIn) { EventHandler(callback_t eventHandlerIn, int32_t freqIn): eventHandler(eventHandlerIn), freq(freqIn) {
} }

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

@ -57,24 +57,11 @@ static multimap<int32_t, EventHandler> tickQueue;
//TODO: consider unordered_map of pairs, or unordered_map of unordered_set, or whatever //TODO: consider unordered_map of pairs, or unordered_map of unordered_set, or whatever
static multimap<Plugin*, EventHandler> handlers[EventType::EVENT_MAX]; static multimap<Plugin*, EventHandler> handlers[EventType::EVENT_MAX];
static map<EventHandler::callback_t,int32_t> eventLastTick; static int32_t eventLastTick[EventType::EVENT_MAX];
static const int32_t ticksPerYear = 403200; static const int32_t ticksPerYear = 403200;
void DFHack::EventManager::registerListener(EventType::EventType e, EventHandler handler, Plugin* plugin) { void DFHack::EventManager::registerListener(EventType::EventType e, EventHandler handler, Plugin* plugin) {
if(e == EventType::TICK){
int32_t when = 0;
df::world* world = df::global::world;
if ( world ) {
when = world->frame_counter + handler.freq;
} else {
if ( Once::doOnce("EventManager registerListener unhonored absolute=false") )
Core::getInstance().getConsole().print("EventManager::registerTick: warning! absolute flag=false not honored.\n");
}
handler.when = when;
tickQueue.insert(pair<int32_t, EventHandler>(handler.when, handler));
}
eventLastTick[handler.eventHandler] = -1;
handlers[e].insert(pair<Plugin*, EventHandler>(plugin, handler)); handlers[e].insert(pair<Plugin*, EventHandler>(plugin, handler));
} }
@ -88,13 +75,9 @@ int32_t DFHack::EventManager::registerTick(EventHandler handler, int32_t when, P
Core::getInstance().getConsole().print("EventManager::registerTick: warning! absolute flag=false not honored.\n"); Core::getInstance().getConsole().print("EventManager::registerTick: warning! absolute flag=false not honored.\n");
} }
} }
handler.when = when; handler.freq = when;
tickQueue.insert(pair<int32_t, EventHandler>(handler.when, handler)); tickQueue.insert(pair<int32_t, EventHandler>(handler.freq, handler));
eventLastTick[handler.eventHandler] = -1; handlers[EventType::TICK].insert(pair<Plugin*,EventHandler>(plugin,handler));
//this commented line ensures "Registered Ticks" are not added back to the queue after execution
//handlers[EventType::TICK].insert(pair<Plugin*,EventHandler>(plugin,handler));
// since the event isn't added to the handlers, we don't need to unregister these events
return when; return when;
} }
@ -120,29 +103,22 @@ void DFHack::EventManager::unregister(EventType::EventType e, EventHandler handl
continue; continue;
} }
i = handlers[e].erase(i); i = handlers[e].erase(i);
eventLastTick.erase(handler.eventHandler);
if ( e == EventType::TICK ) if ( e == EventType::TICK )
removeFromTickQueue(handler); removeFromTickQueue(handler);
} }
} }
void DFHack::EventManager::unregisterAll(Plugin* plugin) { void DFHack::EventManager::unregisterAll(Plugin* plugin) {
for ( auto i = handlers[EventType::TICK].find(plugin); i != handlers[EventType::TICK].end(); ++i ) { for ( auto i = handlers[EventType::TICK].find(plugin); i != handlers[EventType::TICK].end(); i++ ) {
if ( (*i).first != plugin ) if ( (*i).first != plugin )
break; break;
eventLastTick.erase(i->second.eventHandler);
removeFromTickQueue((*i).second); removeFromTickQueue((*i).second);
} }
for (auto &event_type : handlers) { for ( size_t a = 0; a < (size_t)EventType::EVENT_MAX; a++ ) {
for (auto i = event_type.find(plugin); i != event_type.end(); ++i ) { handlers[a].erase(plugin);
if ( (*i).first != plugin )
break;
eventLastTick.erase(i->second.eventHandler);
}
event_type.erase(plugin);
} }
return;
} }
static void manageTickEvent(color_ostream& out); static void manageTickEvent(color_ostream& out);
@ -186,20 +162,15 @@ static const eventManager_t eventManager[] = {
//job initiated //job initiated
static int32_t lastJobId = -1; static int32_t lastJobId = -1;
//job started
static unordered_set<df::job*> startedJobs;
//job completed //job completed
static unordered_map<int32_t, df::job*> prevJobs; static unordered_map<int32_t, df::job*> prevJobs;
//new unit active
static unordered_set<int32_t> activeUnits;
//unit death //unit death
static unordered_set<int32_t> livingUnits; static unordered_set<int32_t> livingUnits;
//item creation //item creation
static int32_t nextItem; static int32_t nextItem;
//building //building
static int32_t nextBuilding; static int32_t nextBuilding;
static unordered_set<int32_t> buildings; static unordered_set<int32_t> buildings;
@ -258,7 +229,7 @@ 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 a = copy.begin(); a != copy.end(); a++ ) {
(*a).second.eventHandler(out, NULL); (*a).second.eventHandler(out, NULL);
} }
} else if ( event == DFHack::SC_MAP_LOADED ) { } else if ( event == DFHack::SC_MAP_LOADED ) {
@ -304,14 +275,15 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
} }
constructions[constr->pos] = *constr; constructions[constr->pos] = *constr;
} }
for ( size_t a = 0; a < df::global::world->buildings.all.size(); ++a ) { for ( size_t a = 0; a < df::global::world->buildings.all.size(); a++ ) {
df::building* b = df::global::world->buildings.all[a]; 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 ( df::unit* unit : df::global::world->units.all ) { for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) {
for ( size_t b = 0; b < unit->syndromes.active.size(); ++b ) { df::unit* unit = df::global::world->units.all[a];
for ( size_t b = 0; b < unit->syndromes.active.size(); b++ ) {
df::unit_syndrome* syndrome = unit->syndromes.active[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 )
@ -326,10 +298,10 @@ void DFHack::EventManager::onStateChange(color_ostream& out, state_change_event
lastReportInteraction = -1; lastReportInteraction = -1;
reportToRelevantUnitsTime = -1; reportToRelevantUnitsTime = -1;
reportToRelevantUnits.clear(); reportToRelevantUnits.clear();
// for ( size_t a = 0; a < EventType::EVENT_MAX; ++a ) { for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) {
// eventLastTick[a] = -1;//-1000000; eventLastTick[a] = -1;//-1000000;
// } }
for ( size_t a = 0; a < df::global::world->history.figures.size(); ++a ) { for ( size_t a = 0; a < df::global::world->history.figures.size(); a++ ) {
df::historical_figure* unit = df::global::world->history.figures[a]; 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;
@ -350,21 +322,23 @@ void DFHack::EventManager::manageEvents(color_ostream& out) {
int32_t tick = df::global::world->frame_counter; int32_t tick = df::global::world->frame_counter;
for (size_t type = 0; type < EventType::EVENT_MAX; type++ ) { for ( size_t a = 0; a < EventType::EVENT_MAX; a++ ) {
if (handlers[type].empty()) if ( handlers[a].empty() )
continue; continue;
bool call_events = false; int32_t eventFrequency = -100;
for (auto &iter : handlers[type]) { if ( a != EventType::TICK )
EventHandler handler = iter.second; for ( auto b = handlers[a].begin(); b != handlers[a].end(); b++ ) {
int32_t last_tick = eventLastTick[handler.eventHandler]; EventHandler bob = (*b).second;
if (tick - last_tick >= handler.freq){ if ( bob.freq < eventFrequency || eventFrequency == -100 )
//todo: integrate into every sub-function eventFrequency = bob.freq;
//eventLastTick[handler.eventHandler] = tick;
call_events = true;
} }
} else eventFrequency = 1;
if(call_events)
eventManager[type](out); if ( tick >= eventLastTick[a] && tick - eventLastTick[a] < eventFrequency )
continue;
eventManager[a](out);
eventLastTick[a] = tick;
} }
} }
@ -383,18 +357,14 @@ static void manageTickEvent(color_ostream& out) {
} }
if ( toRemove.empty() ) if ( toRemove.empty() )
return; return;
for (auto iter = handlers[EventType::TICK].begin(); iter != handlers[EventType::TICK].end(); ) { for ( auto a = handlers[EventType::TICK].begin(); a != handlers[EventType::TICK].end(); ) {
EventHandler &handle = iter->second; EventHandler handle = (*a).second;
//check if we find a handler registered
if ( toRemove.find(handle) == toRemove.end() ) { if ( toRemove.find(handle) == toRemove.end() ) {
//the event is from registerTick, so things are already cleaned up a++;
++iter;
continue; continue;
} }
iter = handlers[EventType::TICK].erase(iter); a = handlers[EventType::TICK].erase(a);
toRemove.erase(handle); toRemove.erase(handle);
//the handler is registered with the listeners, so we want it to keep listening
registerListener(DFHack::EventManager::EventType::TICK, handle, iter->first);
if ( toRemove.empty() ) if ( toRemove.empty() )
break; break;
} }
@ -414,20 +384,14 @@ static void manageJobInitiatedEvent(color_ostream& out) {
return; //no new jobs return; //no new jobs
} }
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());
int32_t tick = df::global::world->frame_counter;
for(auto &iter : copy) { for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) {
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for ( df::job_list_link* link = df::global::world->jobs.list.next; link != NULL; link = link->next ) {
if ( link->item == NULL ) if ( link->item == NULL )
continue; continue;
if ( link->item->id <= lastJobId ) if ( link->item->id <= lastJobId )
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) {
handler.eventHandler(out, (void*)link->item); (*i).second.eventHandler(out, (void*)link->item);
}
} }
} }
@ -438,35 +402,23 @@ static void manageJobStartedEvent(color_ostream& out){
if (!df::global::world) if (!df::global::world)
return; return;
multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end()); static unordered_set<int32_t> startedJobs;
int32_t tick = df::global::world->frame_counter;
// compile a list of newly started jobs // iterate event handler callbacks
std::vector<df::job*> newly_started_jobs; multimap<Plugin*, EventHandler> copy(handlers[EventType::JOB_STARTED].begin(), handlers[EventType::JOB_STARTED].end());
for (auto &key_value : copy) {
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 != NULL; 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)) { if (job && Job::getWorker(job) && !startedJobs.count(job->id)) {
// cross-reference against existing list of jobs with workers startedJobs.emplace(job->id);
if (startedJobs.emplace(job).second) { handler.eventHandler(out, job);
// must be new
newly_started_jobs.push_back(job);
}
}
}
// iterate the event handlers
for(auto &iter : copy) {
auto &handler = iter.second;
// make sure the frequency of this handler is obeyed
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
// send the handler the new jobs
for(auto job : newly_started_jobs){
handler.eventHandler(out, (void*)job);
} }
} }
} }
} }
//helper function for manageJobCompletedEvent //helper function for manageJobCompletedEvent
//static int32_t getWorkerID(df::job* job) { //static int32_t getWorkerID(df::job* job) {
// auto ref = findRef(job->general_refs, general_ref_type::UNIT_WORKER); // auto ref = findRef(job->general_refs, general_ref_type::UNIT_WORKER);
@ -479,12 +431,12 @@ TODO: consider checking item creation / experience gain just in case
static void manageJobCompletedEvent(color_ostream& out) { static void manageJobCompletedEvent(color_ostream& out) {
if (!df::global::world) if (!df::global::world)
return; return;
static int32_t last_tick = -1; int32_t tick0 = eventLastTick[EventType::JOB_COMPLETED];
int32_t tick = df::global::world->frame_counter; int32_t tick1 = df::global::world->frame_counter;
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.next; link != NULL; link = link->next ) { for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) {
if ( link->item == NULL ) if ( link->item == NULL )
continue; continue;
nowJobs[link->item->id] = link->item; nowJobs[link->item->id] = link->item;
@ -506,7 +458,7 @@ static void manageJobCompletedEvent(color_ostream& out) {
" completion_timer : %d\n" " completion_timer : %d\n"
" workerID : %d\n" " workerID : %d\n"
" time : %d -> %d\n" " time : %d -> %d\n"
"\n", job1.list_link->item, job1.id, job1.job_type, ENUM_ATTR(job_type, caption, job1.job_type), job1.flags.bits.working, job1.completion_timer, getWorkerID(&job1), last_tick, tick); "\n", job1.list_link->item, job1.id, job1.job_type, ENUM_ATTR(job_type, caption, job1.job_type), job1.flags.bits.working, job1.completion_timer, getWorkerID(&job1), tick0, tick1);
} }
for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) { for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) {
df::job& job0 = *(*i).second; df::job& job0 = *(*i).second;
@ -520,7 +472,7 @@ static void manageJobCompletedEvent(color_ostream& out) {
" completion_timer : %d\n" " completion_timer : %d\n"
" workerID : %d\n" " workerID : %d\n"
" time : %d -> %d\n" " time : %d -> %d\n"
,job0.list_link == NULL ? 0 : job0.list_link->item, job0.id, job0.job_type, ENUM_ATTR(job_type, caption, job0.job_type), job0.flags.bits.working, job0.completion_timer, getWorkerID(&job0), last_tick, tick); ,job0.list_link == NULL ? 0 : job0.list_link->item, job0.id, job0.job_type, ENUM_ATTR(job_type, caption, job0.job_type), job0.flags.bits.working, job0.completion_timer, getWorkerID(&job0), tick0, tick1);
continue; continue;
} }
df::job& job1 = *(*j).second; df::job& job1 = *(*j).second;
@ -547,60 +499,58 @@ static void manageJobCompletedEvent(color_ostream& out) {
job0.flags.bits.working, job1.flags.bits.working, job0.flags.bits.working, job1.flags.bits.working,
job0.completion_timer, job1.completion_timer, job0.completion_timer, job1.completion_timer,
getWorkerID(&job0), getWorkerID(&job1), getWorkerID(&job0), getWorkerID(&job1),
last_tick, tick tick0, tick1
); );
} }
#endif #endif
for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) {
//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 (last_tick < tick ) { if ( tick1 <= tick0 )
last_tick = tick; continue;
for (auto &iter : copy) {
auto &handler = iter.second; if ( nowJobs.find((*i).first) != nowJobs.end() ) {
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for (auto job_iter = prevJobs.begin(); job_iter != prevJobs.end(); ++job_iter) {
if (nowJobs.find((*job_iter).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 = *(*job_iter).second; df::job& job0 = *(*i).second;
if ( !job0.flags.bits.repeat ) if ( !job0.flags.bits.repeat )
continue; continue;
df::job &job1 = *nowJobs[(*job_iter).first]; df::job& job1 = *nowJobs[(*i).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
handler.eventHandler(out, (void*) &job0); for ( auto j = copy.begin(); j != copy.end(); j++ ) {
(*j).second.eventHandler(out, (void*)&job0);
}
continue; continue;
} }
//recently finished or cancelled job //recently finished or cancelled job
df::job &job0 = *(*job_iter).second; df::job& job0 = *(*i).second;
if ( job0.flags.bits.repeat || job0.completion_timer != 0 ) if ( job0.flags.bits.repeat || job0.completion_timer != 0 )
continue; continue;
handler.eventHandler(out, (void*) &job0);
} for ( auto j = copy.begin(); j != copy.end(); j++ ) {
} (*j).second.eventHandler(out, (void*)&job0);
} }
} }
//erase old jobs, copy over possibly altered jobs //erase old jobs, copy over possibly altered jobs
for (auto job_iter = prevJobs.begin(); job_iter != prevJobs.end(); ++job_iter ) { for ( auto i = prevJobs.begin(); i != prevJobs.end(); i++ ) {
Job::deleteJobStruct((*job_iter).second, true); Job::deleteJobStruct((*i).second, true);
startedJobs.erase(job_iter->second);
} }
prevJobs.clear(); prevJobs.clear();
//create new jobs //create new jobs
for (auto job_iter = nowJobs.begin(); job_iter != nowJobs.end(); ++job_iter ) { for ( auto j = nowJobs.begin(); j != nowJobs.end(); j++ ) {
/*map<int32_t, df::job*>::iterator i = prevJobs.find((*job_iter).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((*job_iter).second, true); df::job* newJob = Job::cloneJobStruct((*j).second, true);
prevJobs[newJob->id] = newJob; prevJobs[newJob->id] = newJob;
} }
} }
@ -608,35 +558,28 @@ static void manageJobCompletedEvent(color_ostream& out) {
static void manageNewUnitActiveEvent(color_ostream& out) { static void manageNewUnitActiveEvent(color_ostream& out) {
if (!df::global::world) if (!df::global::world)
return; return;
unordered_set<int32_t> activeUnits_replacement;
multimap<Plugin*,EventHandler> copy(handlers[EventType::NEW_UNIT_ACTIVE].begin(), handlers[EventType::NEW_UNIT_ACTIVE].end()); static unordered_set<int32_t> activeUnits;
int32_t tick = df::global::world->frame_counter; multimap<Plugin*,EventHandler> copy(handlers[EventType::UNIT_NEW_ACTIVE].begin(), handlers[EventType::UNIT_NEW_ACTIVE].end());
for (auto unit : df::global::world->units.active) { // iterate event handler callbacks
for (auto &key_value : copy) {
auto &handler = key_value.second;
for (df::unit* unit : df::global::world->units.active) {
int32_t id = unit->id; int32_t id = unit->id;
activeUnits_replacement.emplace(id); if (!activeUnits.count(id)) {
if(activeUnits.find(id) == activeUnits.end()){
for (auto &iter : copy) {
auto &handler = iter.second;
if(tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
handler.eventHandler(out, (void*) intptr_t(id)); // intptr_t() avoids cast from smaller type warning handler.eventHandler(out, (void*) intptr_t(id)); // intptr_t() avoids cast from smaller type warning
} }
} }
} }
} }
activeUnits.swap(activeUnits_replacement);
}
static void manageUnitDeathEvent(color_ostream& out) { 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());
int32_t tick = df::global::world->frame_counter; for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) {
for (auto &iter : copy) { df::unit* unit = df::global::world->units.all[a];
auto &handler = iter.second;
if(tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for ( df::unit *unit : df::global::world->units.all ) {
//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);
@ -646,10 +589,10 @@ static void manageUnitDeathEvent(color_ostream& out) {
if ( livingUnits.find(unit->id) == livingUnits.end() ) if ( livingUnits.find(unit->id) == livingUnits.end() )
continue; continue;
handler.eventHandler(out, (void*) intptr_t(unit->id)); // intptr_t() avoids cast from smaller type warning for ( auto i = copy.begin(); i != copy.end(); i++ ) {
livingUnits.erase(unit->id); (*i).second.eventHandler(out, (void*)intptr_t(unit->id));
}
} }
livingUnits.erase(unit->id);
} }
} }
@ -663,14 +606,9 @@ static void manageItemCreationEvent(color_ostream& out) {
} }
multimap<Plugin*,EventHandler> copy(handlers[EventType::ITEM_CREATED].begin(), handlers[EventType::ITEM_CREATED].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::ITEM_CREATED].begin(), handlers[EventType::ITEM_CREATED].end());
int32_t tick = df::global::world->frame_counter;
size_t index = df::item::binsearch_index(df::global::world->items.all, nextItem, false); size_t index = df::item::binsearch_index(df::global::world->items.all, nextItem, false);
if ( index != 0 ) index--; if ( index != 0 ) index--;
for (auto &iter : copy) { for ( size_t a = index; a < df::global::world->items.all.size(); a++ ) {
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for (size_t a = index; a < df::global::world->items.all.size(); ++a) {
df::item* item = df::global::world->items.all[a]; df::item* item = df::global::world->items.all[a];
//already processed //already processed
if ( item->id < nextItem ) if ( item->id < nextItem )
@ -687,8 +625,8 @@ 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;
handler.eventHandler(out, (void*) intptr_t(item->id)); for ( auto i = copy.begin(); i != copy.end(); i++ ) {
} (*i).second.eventHandler(out, (void*)intptr_t(item->id));
} }
} }
nextItem = *df::global::item_next_id; nextItem = *df::global::item_next_id;
@ -704,13 +642,8 @@ static void manageBuildingEvent(color_ostream& out) {
* consider looking at jobs: building creation / destruction * consider looking at jobs: building creation / destruction
**/ **/
multimap<Plugin*,EventHandler> copy(handlers[EventType::BUILDING].begin(), handlers[EventType::BUILDING].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::BUILDING].begin(), handlers[EventType::BUILDING].end());
int32_t tick = df::global::world->frame_counter; //first alert people about new buildings
//no more separation between new and destroyed events for ( int32_t a = nextBuilding; a < *df::global::building_next_id; a++ ) {
for (auto &iter : copy) {
auto &handler = iter.second;
if(tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for ( int32_t a = nextBuilding; a < *df::global::building_next_id; ++a ) {
int32_t index = df::building::binsearch_index(df::global::world->buildings.all, a); int32_t index = df::building::binsearch_index(df::global::world->buildings.all, a);
if ( index == -1 ) { if ( index == -1 ) {
//out.print("%s, line %d: Couldn't find new building with id %d.\n", __FILE__, __LINE__, a); //out.print("%s, line %d: Couldn't find new building with id %d.\n", __FILE__, __LINE__, a);
@ -718,24 +651,28 @@ static void manageBuildingEvent(color_ostream& out) {
continue; continue;
} }
buildings.insert(a); buildings.insert(a);
handler.eventHandler(out, (void*)intptr_t(a)); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler bob = (*b).second;
bob.eventHandler(out, (void*)intptr_t(a));
} }
}
nextBuilding = *df::global::building_next_id;
//now alert people about destroyed buildings //now alert people about destroyed buildings
for (auto building_iter = buildings.begin(); building_iter != buildings.end(); ) { for ( auto a = buildings.begin(); a != buildings.end(); ) {
int32_t id = *building_iter; int32_t id = *a;
int32_t index = df::building::binsearch_index(df::global::world->buildings.all,id); int32_t index = df::building::binsearch_index(df::global::world->buildings.all,id);
if ( index != -1 ) { if ( index != -1 ) {
++building_iter; a++;
continue; continue;
} }
handler.eventHandler(out, (void*)intptr_t(id));
building_iter = buildings.erase(building_iter); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
} EventHandler bob = (*b).second;
bob.eventHandler(out, (void*)intptr_t(id));
} }
a = buildings.erase(a);
} }
nextBuilding = *df::global::building_next_id;
} }
static void manageConstructionEvent(color_ostream& out) { static void manageConstructionEvent(color_ostream& out) {
@ -744,31 +681,33 @@ 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());
int32_t tick = df::global::world->frame_counter; for ( auto a = constructions.begin(); a != constructions.end(); ) {
for (auto &iter : copy) { df::construction& construction = (*a).second;
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for (auto constru_iter = constructions.begin(); constru_iter != constructions.end();) {
df::construction &construction = (*constru_iter).second;
if ( df::construction::find(construction.pos) != NULL ) { if ( df::construction::find(construction.pos) != NULL ) {
++constru_iter; a++;
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);
handler.eventHandler(out, (void*) &construction); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
constru_iter = constructions.erase(constru_iter); EventHandler handle = (*b).second;
} handle.eventHandler(out, (void*)&construction);
//for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); ++a ) { }
for (auto constru_iter = df::global::world->constructions.begin(); constru_iter != df::global::world->constructions.end(); ++constru_iter) { a = constructions.erase(a);
df::construction* construction = *constru_iter; }
if (!constructions.emplace(construction->pos, *construction).second)
continue; //not a new insertion, skip //for ( auto a = constructionsNow.begin(); a != constructionsNow.end(); a++ ) {
for ( auto a = df::global::world->constructions.begin(); a != df::global::world->constructions.end(); a++ ) {
df::construction* construction = *a;
bool b = constructions.find(construction->pos) != constructions.end();
constructions[construction->pos] = *construction;
if ( b )
continue;
//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);
handler.eventHandler(out, (void*) construction); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
} EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)construction);
} }
} }
} }
@ -778,17 +717,13 @@ 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;
int32_t tick = df::global::world->frame_counter; for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) {
for (auto &iter : copy) { df::unit* unit = *a;
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for ( df::unit *unit : df::global::world->units.all ) {
/* /*
if ( unit->flags1.bits.inactive ) if ( unit->flags1.bits.inactive )
continue; continue;
*/ */
for ( size_t b = 0; b < unit->syndromes.active.size(); ++b ) { for ( size_t b = 0; b < unit->syndromes.active.size(); b++ ) {
df::unit_syndrome* syndrome = unit->syndromes.active[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 > highestTime ) if ( startTime > highestTime )
@ -797,8 +732,9 @@ static void manageSyndromeEvent(color_ostream& out) {
continue; continue;
SyndromeData data(unit->id, b); SyndromeData data(unit->id, b);
handler.eventHandler(out, (void*)&data); for ( auto c = copy.begin(); c != copy.end(); c++ ) {
} EventHandler handle = (*c).second;
handle.eventHandler(out, (void*)&data);
} }
} }
} }
@ -814,13 +750,9 @@ static void manageInvasionEvent(color_ostream& out) {
return; return;
nextInvasion = df::global::ui->invasions.next_id; nextInvasion = df::global::ui->invasions.next_id;
int32_t tick = df::global::world->frame_counter; for ( auto a = copy.begin(); a != copy.end(); a++ ) {
for (auto &iter : copy) { EventHandler handle = (*a).second;
auto &handler = iter.second; handle.eventHandler(out, (void*)intptr_t(nextInvasion-1));
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
handler.eventHandler(out, (void*) intptr_t(nextInvasion - 1));
}
} }
} }
@ -831,14 +763,10 @@ 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;
int32_t tick = df::global::world->frame_counter; for ( auto a = df::global::world->units.all.begin(); a != df::global::world->units.all.end(); a++ ) {
for (auto &iter : copy) {
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
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;
*/ */
@ -853,10 +781,11 @@ 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 &item : v) { for ( auto b = v.begin(); b != v.end(); b++ ) {
itemIdToInventoryItem[item.itemId] = item; InventoryItem& i = *b;
itemIdToInventoryItem[i.itemId] = i;
} }
for (size_t b = 0; b < unit->inventory.size(); ++b) { for ( size_t b = 0; b < unit->inventory.size(); b++ ) {
df::unit_inventory_item* dfitem_new = unit->inventory[b]; df::unit_inventory_item* dfitem_new = unit->inventory[b];
currentlyEquipped.insert(dfitem_new->item->id); currentlyEquipped.insert(dfitem_new->item->id);
InventoryItem item_new(dfitem_new->item->id, *dfitem_new); InventoryItem item_new(dfitem_new->item->id, *dfitem_new);
@ -864,29 +793,37 @@ static void manageEquipmentEvent(color_ostream& out) {
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, NULL, &item_new);
handler.eventHandler(out, (void*) &data); for ( auto h = copy.begin(); h != copy.end(); h++ ) {
EventHandler handle = (*h).second;
handle.eventHandler(out, (void*)&data);
}
continue; continue;
} }
InventoryItem item_old = (*c).second; InventoryItem item_old = (*c).second;
df::unit_inventory_item& item0 = item_old.item; df::unit_inventory_item& item0 = item_old.item;
df::unit_inventory_item& item1 = item_new.item; df::unit_inventory_item& item1 = item_new.item;
if (item0.mode == item1.mode && item0.body_part_id == item1.body_part_id && if ( item0.mode == item1.mode && item0.body_part_id == item1.body_part_id && item0.wound_id == item1.wound_id )
item0.wound_id == item1.wound_id)
continue; continue;
//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);
handler.eventHandler(out, (void*) &data); for ( auto h = copy.begin(); h != copy.end(); h++ ) {
EventHandler handle = (*h).second;
handle.eventHandler(out, (void*)&data);
}
} }
//check for dropped items //check for dropped items
for (auto b = v.begin(); b != v.end(); ++b) { for ( auto b = v.begin(); b != v.end(); b++ ) {
InventoryItem i = *b; 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, NULL);
handler.eventHandler(out, (void*) &data); for ( auto h = copy.begin(); h != copy.end(); h++ ) {
EventHandler handle = (*h).second;
handle.eventHandler(out, (void*)&data);
}
} }
if ( !hadEquipment ) if ( !hadEquipment )
delete temp; delete temp;
@ -894,15 +831,13 @@ 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 ( size_t b = 0; b < unit->inventory.size(); b++ ) {
df::unit_inventory_item* dfitem = unit->inventory[b]; 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);
} }
} }
} }
}
}
static void updateReportToRelevantUnits() { static void updateReportToRelevantUnits() {
if (!df::global::world) if (!df::global::world)
@ -911,8 +846,9 @@ static void updateReportToRelevantUnits() {
return; return;
reportToRelevantUnitsTime = df::global::world->frame_counter; reportToRelevantUnitsTime = df::global::world->frame_counter;
for ( df::unit *unit : df::global::world->units.all ) { for ( size_t a = 0; a < df::global::world->units.all.size(); 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 ) { 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++ ) {
if ( b == df::unit_report_type::Sparring ) if ( b == df::unit_report_type::Sparring )
continue; continue;
for ( size_t c = 0; c < unit->reports.log[b].size(); c++ ) { for ( size_t c = 0; c < unit->reports.log[b].size(); c++ ) {
@ -933,24 +869,20 @@ static void manageReportEvent(color_ostream& out) {
size_t a = df::report::binsearch_index(reports, lastReport, false); size_t a = 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 (a < reports.size() && reports[a]->id <= lastReport) {
++a; a++;
} }
int32_t tick = df::global::world->frame_counter; for ( ; a < reports.size(); a++ ) {
for (auto &iter : copy) {
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for (; a < reports.size(); ++a) {
df::report* report = reports[a]; df::report* report = reports[a];
handler.eventHandler(out, (void*) intptr_t(report->id)); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
lastReport = report->id; EventHandler handle = (*b).second;
} handle.eventHandler(out, (void*)intptr_t(report->id));
} }
lastReport = report->id;
} }
} }
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 ( size_t a = 0; a < defender->body.wounds.size(); a++ ) {
df::unit_wound* wound = defender->body.wounds[a]; 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;
@ -967,10 +899,10 @@ static void manageUnitAttackEvent(color_ostream& out) {
size_t a = df::report::binsearch_index(reports, lastReportUnitAttack, false); size_t a = 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 (a < reports.size() && reports[a]->id <= lastReportUnitAttack) {
++a; a++;
} }
std::set<int32_t> strikeReports; std::set<int32_t> strikeReports;
for ( ; a < reports.size(); ++a ) { for ( ; a < reports.size(); a++ ) {
df::report* report = reports[a]; df::report* report = reports[a];
lastReportUnitAttack = report->id; lastReportUnitAttack = report->id;
if ( report->flags.bits.continuation ) if ( report->flags.bits.continuation )
@ -985,17 +917,13 @@ 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;
int32_t tick = df::global::world->frame_counter; for ( auto a = strikeReports.begin(); a != strikeReports.end(); a++ ) {
for (auto &iter : copy) { int32_t reportId = *a;
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for (int reportId : strikeReports) {
df::report* report = df::report::find(reportId); df::report* report = df::report::find(reportId);
if ( !report ) if ( !report )
continue; //TODO: error continue; //TODO: error
std::string reportStr = report->text; std::string reportStr = report->text;
for ( int32_t b = reportId+1; ; ++b ) { for ( int32_t b = reportId+1; ; b++ ) {
df::report* report2 = df::report::find(b); df::report* report2 = df::report::find(b);
if ( !report2 ) if ( !report2 )
break; break;
@ -1024,7 +952,10 @@ static void manageUnitAttackEvent(color_ostream& out) {
data.wound = wound1->id; data.wound = wound1->id;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
handler.eventHandler(out, (void*)&data); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)&data);
}
} }
if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) { if ( wound2 && !alreadyDone[unit1->id][unit2->id] ) {
@ -1034,7 +965,10 @@ static void manageUnitAttackEvent(color_ostream& out) {
data.wound = wound2->id; data.wound = wound2->id;
alreadyDone[data.attacker][data.defender] = 1; alreadyDone[data.attacker][data.defender] = 1;
handler.eventHandler(out, (void*)&data); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)&data);
}
} }
if ( Units::isKilled(unit1) ) { if ( Units::isKilled(unit1) ) {
@ -1043,7 +977,10 @@ static void manageUnitAttackEvent(color_ostream& out) {
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;
handler.eventHandler(out, (void*)&data); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)&data);
}
} }
if ( Units::isKilled(unit2) ) { if ( Units::isKilled(unit2) ) {
@ -1052,7 +989,10 @@ static void manageUnitAttackEvent(color_ostream& out) {
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;
handler.eventHandler(out, (void*)&data); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)&data);
}
} }
if ( !wound1 && !wound2 ) { if ( !wound1 && !wound2 ) {
@ -1066,8 +1006,6 @@ 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(reportStr);
@ -1107,7 +1045,7 @@ static InteractionData getAttacker(color_ostream& out, df::report* attackEvent,
//find valid interactions: TODO //find valid interactions: TODO
/*map<int32_t,vector<df::interaction*> > validInteractions; /*map<int32_t,vector<df::interaction*> > validInteractions;
for ( size_t a = 0; a < relevantUnits.size(); ++a ) { for ( size_t a = 0; a < relevantUnits.size(); a++ ) {
df::unit* unit = relevantUnits[a]; df::unit* unit = relevantUnits[a];
vector<df::interaction*>& interactions = validInteractions[unit->id]; vector<df::interaction*>& interactions = validInteractions[unit->id];
for ( size_t b = 0; b < unit->body. for ( size_t b = 0; b < unit->body.
@ -1120,7 +1058,7 @@ static InteractionData getAttacker(color_ostream& out, df::report* attackEvent,
std::string attackVerb; std::string attackVerb;
if ( attackEvent ) { if ( attackEvent ) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
for ( size_t a = 0; a < attackers.size(); ++a ) { for ( size_t a = 0; a < attackers.size(); a++ ) {
if ( attackers[a]->pos != attackEvent->pos ) { if ( attackers[a]->pos != attackEvent->pos ) {
attackers.erase(attackers.begin()+a); attackers.erase(attackers.begin()+a);
a--; a--;
@ -1149,7 +1087,7 @@ static InteractionData getAttacker(color_ostream& out, df::report* attackEvent,
std::string defendVerb; std::string defendVerb;
if ( defendEvent ) { if ( defendEvent ) {
//out.print("%s,%d\n",__FILE__,__LINE__); //out.print("%s,%d\n",__FILE__,__LINE__);
for ( size_t a = 0; a < defenders.size(); ++a ) { for ( size_t a = 0; a < defenders.size(); a++ ) {
if ( defenders[a]->pos != defendEvent->pos ) { if ( defenders[a]->pos != defendEvent->pos ) {
defenders.erase(defenders.begin()+a); defenders.erase(defenders.begin()+a);
a--; a--;
@ -1224,7 +1162,7 @@ static vector<df::unit*> gatherRelevantUnits(color_ostream& out, df::report* r1,
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 ( size_t a = 0; a < reports.size(); a++ ) {
//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[reports[a]->id];
if ( units.size() > 2 ) { if ( units.size() > 2 ) {
@ -1232,7 +1170,7 @@ static vector<df::unit*> gatherRelevantUnits(color_ostream& out, df::report* r1,
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__, reports[a]->text.c_str());
} }
} }
for ( size_t b = 0; b < units.size(); ++b ) for ( size_t b = 0; b < units.size(); b++ )
if ( ids.find(units[b]) == ids.end() ) { if ( ids.find(units[b]) == ids.end() ) {
ids.insert(units[b]); ids.insert(units[b]);
result.push_back(df::unit::find(units[b])); result.push_back(df::unit::find(units[b]));
@ -1249,7 +1187,7 @@ static void manageInteractionEvent(color_ostream& out) {
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, lastReportInteraction, false); size_t a = df::report::binsearch_index(reports, lastReportInteraction, false);
while (a < reports.size() && reports[a]->id <= lastReportInteraction) { while (a < reports.size() && reports[a]->id <= lastReportInteraction) {
++a; a++;
} }
if ( a < reports.size() ) if ( a < reports.size() )
updateReportToRelevantUnits(); updateReportToRelevantUnits();
@ -1258,12 +1196,7 @@ static void manageInteractionEvent(color_ostream& out) {
df::unit* lastAttacker = NULL; df::unit* lastAttacker = NULL;
//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;
int32_t tick = df::global::world->frame_counter; for ( ; a < reports.size(); a++ ) {
for (auto &iter : copy) {
auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick;
for ( ; a < reports.size(); ++a ) {
df::report* report = reports[a]; df::report* report = reports[a];
lastReportInteraction = report->id; lastReportInteraction = report->id;
df::announcement_type type = report->type; df::announcement_type type = report->type;
@ -1291,7 +1224,7 @@ static void manageInteractionEvent(color_ostream& out) {
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;
++a; a++;
} }
} }
{ {
@ -1314,10 +1247,11 @@ 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
handler.eventHandler(out, (void*)&data); for ( auto b = copy.begin(); b != copy.end(); b++ ) {
//TODO: deduce attacker from latest defend event first EventHandler handle = (*b).second;
} handle.eventHandler(out, (void*)&data);
} }
//TODO: deduce attacker from latest defend event first
} }
} }