miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow multiple event handlers for the same slot

Browse Source
This commit is contained in:
dP
2020-07-07 21:50:27 +03:00
parent f99c33b48c
commit fb70135c3e
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/citymania/cm_event.hpp
View File

@@ -107,10 +107,11 @@ struct CompanyBalanceChanged {
}; };
enum class Slot : uint8 { enum class Slot : uint8 {
CONTROLLER = 10, GOAL = 10,
GAME = 20, CONTROLLER = 20,
CONTROLLER_POST = 30, GAME = 30,
RECORDER = 40, CONTROLLER_POST = 40,
RECORDER = 50,
}; };
class TypeDispatcherBase { class TypeDispatcherBase {
@@ -128,11 +129,7 @@ public:
virtual ~TypeDispatcher() {} virtual ~TypeDispatcher() {}
void listen(Slot slot, Handler &handler) { void listen(Slot slot, Handler &handler) {
auto p = this->handler_map.find(slot); this->handler_map.insert(std::make_pair(slot, handler));
if (p != this->handler_map.end())
IConsolePrintF(CC_ERROR, "ERROR: Ignored duplicate handler for event %s slot %d", typeid(T).name(), (int)slot);
this->handler_map.insert(p, std::make_pair(slot, handler));
this->new_handlers = true;
} }
void emit(const T &event) { void emit(const T &event) {
@@ -149,7 +146,7 @@ public:
protected: protected:
std::vector<Handler> handlers; std::vector<Handler> handlers;
std::map<Slot, Handler> handler_map; std::multimap<Slot, Handler> handler_map;
bool new_handlers = false; bool new_handlers = false;
}; };