diff --git a/include/Engine/Core/InputController.h b/include/Engine/Core/InputController.h index 0cad346f..b87d1eff 100644 --- a/include/Engine/Core/InputController.h +++ b/include/Engine/Core/InputController.h @@ -17,8 +17,7 @@ public: virtual void Initialize() { - EVENT_SUBSCRIBE_MEMBER( - m_EInputCommand, &InputController::OnCommand); + EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &InputController::OnCommand); } virtual bool OnCommand(const Events::InputCommand& e) { return false; } diff --git a/include/Game/Game.h b/include/Game/Game.h index a090827b..7933c8a1 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -39,6 +39,7 @@ private: World* m_World; SystemPipeline* m_SystemPipeline; RenderQueueFactory* m_RenderQueueFactory; + EventRelay m_EInputCommand; bool debugOnInputCommand(const Events::InputCommand& e); diff --git a/src/Engine/Core/ConfigFile.cpp b/src/Engine/Core/ConfigFile.cpp index fbb03b14..00ab4993 100644 --- a/src/Engine/Core/ConfigFile.cpp +++ b/src/Engine/Core/ConfigFile.cpp @@ -27,9 +27,6 @@ ConfigFile::ConfigFile(std::string path) for (auto& topLevelNode : m_PTreeOverrides) { auto& mergedTopLevelNode = m_PTreeMerged.find(topLevelNode.first); for (auto& childOverrideNode : topLevelNode.second) { - //auto ttt = mergedTopLevelNode->second; - //auto ttt2 = childOverrideNode.first; - //auto ttt3 = childOverrideNode.second; mergedTopLevelNode->second.put_child(childOverrideNode.first, childOverrideNode.second); } } diff --git a/src/Engine/Core/EventBroker.cpp b/src/Engine/Core/EventBroker.cpp index c12f915f..76c243e8 100644 --- a/src/Engine/Core/EventBroker.cpp +++ b/src/Engine/Core/EventBroker.cpp @@ -1,4 +1,4 @@ -#include "Core\EventBroker.h" +#include "Core/EventBroker.h" BaseEventRelay::~BaseEventRelay() {