Skip to content

Fix 2031 by revert #2056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 29, 2022
Merged

Fix 2031 by revert #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d000c2a
Reverts - checkout master -- library/modules/EventManager.cpp
cppcooper Mar 29, 2022
c494dd4
Reimplements new event types
cppcooper Mar 29, 2022
5606987
Fixes build errors
cppcooper Mar 29, 2022
ae3f1c7
remove unused 'when' member
myk002 Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions library/include/modules/EventManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace DFHack {
JOB_INITIATED,
JOB_STARTED, //has a worker
JOB_COMPLETED,
NEW_UNIT_ACTIVE,
UNIT_NEW_ACTIVE,
UNIT_DEATH,
ITEM_CREATED,
BUILDING,
Expand All @@ -42,7 +42,6 @@ namespace DFHack {
typedef void (*callback_t)(color_ostream&, void*); //called when the event happens
callback_t eventHandler;
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) {
}
Expand Down
Loading