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

Fixes some build errors

develop
Josh Cooper 2022-01-26 10:05:32 -08:00 committed by Myk
parent 524f1670ed
commit c8e7869375
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,13 +607,14 @@ static void manageNewUnitActiveEvent(color_ostream& out) {
multimap<Plugin*,EventHandler> copy(handlers[EventType::NEW_UNIT_ACTIVE].begin(), handlers[EventType::NEW_UNIT_ACTIVE].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::NEW_UNIT_ACTIVE].begin(), handlers[EventType::NEW_UNIT_ACTIVE].end());
int32_t tick = df::global::world->frame_counter; int32_t tick = df::global::world->frame_counter;
for (auto unit : df::global::world->units.active) { for (auto unit : df::global::world->units.active) {
activeUnits_replacement.emplace(unit); int32_t id = unit->id;
if(activeUnits.find(unit) == activeUnits.end()){ activeUnits_replacement.emplace(id);
if(activeUnits.find(id) == activeUnits.end()){
for (auto &iter : copy) { for (auto &iter : copy) {
auto &handler = iter.second; auto &handler = iter.second;
if(tick - eventLastTick[handler.eventHandler] >= handler.freq) { if(tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick; eventLastTick[handler.eventHandler] = tick;
handler.eventHandler(out, (void*) intptr_t(unit->id)); handler.eventHandler(out, (void*) intptr_t(id)); // intptr_t() avoids cast from smaller type warning
} }
} }
} }
@ -640,7 +641,7 @@ 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)); handler.eventHandler(out, (void*) intptr_t(unit->id)); // intptr_t() avoids cast from smaller type warning
livingUnits.erase(unit->id); livingUnits.erase(unit->id);
} }
} }