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

fix crash in eventful due to misaligned fn map (#2059) 

also add warnings in eventful and EventManager to prompt devs to keep them in sync
develop
Myk 2022-03-29 12:51:21 -07:00 committed by GitHub
parent 69ca0d8a28
commit 2df6980237
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 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

@ -17,6 +17,9 @@
namespace DFHack { namespace DFHack {
namespace EventManager { namespace EventManager {
namespace EventType { namespace EventType {
// NOTICE: keep this list synchronized with the eventHandlers array
// in plugins/eventful.cpp or else events will go to the wrong
// handlers.
enum EventType { enum EventType {
TICK, TICK,
JOB_INITIATED, JOB_INITIATED,

12
plugins/eventful.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ DEFINE_LUA_EVENT_NH_1(onBuildingCreatedDestroyed, int32_t);
DEFINE_LUA_EVENT_NH_1(onJobInitiated, df::job*); DEFINE_LUA_EVENT_NH_1(onJobInitiated, df::job*);
DEFINE_LUA_EVENT_NH_1(onJobStarted, df::job*); DEFINE_LUA_EVENT_NH_1(onJobStarted, df::job*);
DEFINE_LUA_EVENT_NH_1(onJobCompleted, df::job*); DEFINE_LUA_EVENT_NH_1(onJobCompleted, df::job*);
DEFINE_LUA_EVENT_NH_1(onNewUnitActive, int32_t); DEFINE_LUA_EVENT_NH_1(onUnitNewActive, int32_t);
DEFINE_LUA_EVENT_NH_1(onUnitDeath, int32_t); DEFINE_LUA_EVENT_NH_1(onUnitDeath, int32_t);
DEFINE_LUA_EVENT_NH_1(onItemCreated, int32_t); DEFINE_LUA_EVENT_NH_1(onItemCreated, int32_t);
DEFINE_LUA_EVENT_NH_1(onConstructionCreatedDestroyed, df::construction*); DEFINE_LUA_EVENT_NH_1(onConstructionCreatedDestroyed, df::construction*);
@ -126,7 +126,7 @@ DFHACK_PLUGIN_LUA_EVENTS {
DFHACK_LUA_EVENT(onJobInitiated), DFHACK_LUA_EVENT(onJobInitiated),
DFHACK_LUA_EVENT(onJobStarted), DFHACK_LUA_EVENT(onJobStarted),
DFHACK_LUA_EVENT(onJobCompleted), DFHACK_LUA_EVENT(onJobCompleted),
DFHACK_LUA_EVENT(onNewUnitActive), DFHACK_LUA_EVENT(onUnitNewActive),
DFHACK_LUA_EVENT(onUnitDeath), DFHACK_LUA_EVENT(onUnitDeath),
DFHACK_LUA_EVENT(onItemCreated), DFHACK_LUA_EVENT(onItemCreated),
DFHACK_LUA_EVENT(onSyndrome), DFHACK_LUA_EVENT(onSyndrome),
@ -154,10 +154,10 @@ void ev_mng_jobCompleted(color_ostream& out, void* job)
df::job* ptr=reinterpret_cast<df::job*>(job); df::job* ptr=reinterpret_cast<df::job*>(job);
onJobCompleted(out,ptr); onJobCompleted(out,ptr);
} }
void ev_mng_newUnitActive(color_ostream& out, void* ptr) void ev_mng_unitNewActive(color_ostream& out, void* ptr)
{ {
int32_t myId=(int32_t)(intptr_t)ptr; int32_t myId=(int32_t)(intptr_t)ptr;
onNewUnitActive(out,myId); onUnitNewActive(out,myId);
} }
void ev_mng_unitDeath(color_ostream& out, void* ptr) void ev_mng_unitDeath(color_ostream& out, void* ptr)
{ {
@ -222,11 +222,15 @@ static void ev_mng_interaction(color_ostream& out, void* ptr) {
} }
std::vector<int> enabledEventManagerEvents(EventManager::EventType::EVENT_MAX,-1); std::vector<int> enabledEventManagerEvents(EventManager::EventType::EVENT_MAX,-1);
typedef void (*handler_t) (color_ostream&,void*); typedef void (*handler_t) (color_ostream&,void*);
// NOTICE: keep this list synchronized with the EventManager::EventType enum or
// else the wrong event handlers will get called.
static const handler_t eventHandlers[] = { static const handler_t eventHandlers[] = {
NULL, NULL,
ev_mng_jobInitiated, ev_mng_jobInitiated,
ev_mng_jobStarted, ev_mng_jobStarted,
ev_mng_jobCompleted, ev_mng_jobCompleted,
ev_mng_unitNewActive,
ev_mng_unitDeath, ev_mng_unitDeath,
ev_mng_itemCreate, ev_mng_itemCreate,
ev_mng_building, ev_mng_building,