Adjusted some of the corefiles back to the original in preparation for the Pull Request
This commit is contained in:
@@ -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; }
|
||||
|
||||
@@ -39,6 +39,7 @@ private:
|
||||
World* m_World;
|
||||
SystemPipeline* m_SystemPipeline;
|
||||
RenderQueueFactory* m_RenderQueueFactory;
|
||||
|
||||
EventRelay<Game, Events::InputCommand> m_EInputCommand;
|
||||
bool debugOnInputCommand(const Events::InputCommand& e);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "Core\EventBroker.h"
|
||||
#include "Core/EventBroker.h"
|
||||
|
||||
BaseEventRelay::~BaseEventRelay()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user