Merge branch 'master' into console-func-refactor

Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
This commit is contained in:
Daniel Buckmaster 2014-10-14 14:40:17 +11:00
commit b507dc9555
6487 changed files with 315149 additions and 609761 deletions

View file

@ -58,6 +58,9 @@ class EventManagerListener : public Dispatcher::IMessageListener
SimpleHashTable< Vector<Subscriber> > mSubscribers;
public:
// Ensure that the subscriber map doesn't use case-sensitive string comparisons.
EventManagerListener(): mSubscribers(64, false) {}
/// Called by the EventManager queue when an event is triggered. Calls all listeners subscribed to the triggered event.
virtual bool onMessageReceived( StringTableEntry queue, const char* event, const char* data );
virtual bool onMessageObjectReceived( StringTableEntry queue, Message *msg ) { return true; };