From ce873108aa91d19104f46c5acd3350385e7a4541 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Fri, 30 Mar 2018 18:32:52 +0200 Subject: Client eventmanager refactor (#7179) * Drop EventManager from GameDef & do some client cleanups * EventManager is only used by Client. Don't expose it on Server & GameDef for nothing * Drop Client::event() in favor of direct calls to getEventManager * Cleanup some event put from new + put to put(new) * MtEvent: add Type(u8) enum * This will enhance event performance & ensure stricter type * Drop MtEvent::checkIs (unused) * clang-tidy reported fixes * Code style * Move event_manager.h to the client directory as it's only used by client Add EventManager unittests + switch to unordered_map as order is not important here Drop a unused function --- src/client.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index 2034a1f9c..5c07d043e 100644 --- a/src/client.h +++ b/src/client.h @@ -370,10 +370,9 @@ public: ICraftDefManager* getCraftDefManager() override; ITextureSource* getTextureSource(); virtual IShaderSource* getShaderSource(); - IShaderSource *shsrc() { return getShaderSource(); } u16 allocateUnknownNodeId(const std::string &name) override; virtual ISoundManager* getSoundManager(); - MtEventManager* getEventManager() override; + MtEventManager* getEventManager(); virtual ParticleManager* getParticleManager(); bool checkLocalPrivilege(const std::string &priv) { return checkPrivilege(priv); } -- cgit v1.2.3