Mercurial > fife-parpg

diff engine/core/eventchannel/eventmanager.cpp @ 624:b312d170ab0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Removed the "trigger" system as it was not in use and very incomplete. I couldn't come up with a good reason why it should be part of event channel either. The trigger system is scheduled for a future release anyway.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 01 Oct 2010 19:25:40 +0000
parents a1884665aa95
children ca1fcb96907d
line wrap: on
line diff
--- a/engine/core/eventchannel/eventmanager.cpp	Fri Oct 01 16:26:22 2010 +0000
+++ b/engine/core/eventchannel/eventmanager.cpp	Fri Oct 01 19:25:40 2010 +0000
@@ -34,7 +34,6 @@
 #include "eventchannel/key/ec_ikeyfilter.h"
 #include "eventchannel/mouse/ec_mouseevent.h"
 #include "eventchannel/command/ec_command.h"
-#include "eventchannel/trigger/ec_trigger.h"
 
 #include "eventmanager.h"
 
@@ -382,7 +381,6 @@
 			if(has_next_event)
 				event = next_event;
 		}
-		pollTriggers();
 	}
 
 	void EventManager::processActiveEvent(SDL_Event event) {
@@ -537,20 +535,6 @@
 		return ES_ENGINE;
 	}
 
-	void EventManager::registerTrigger(Trigger& trigger){
-		m_triggers.push_back(&trigger);
-	}
-
-	void EventManager::unregisterTrigger(Trigger& trigger){
-		m_triggers.remove(&trigger);
-	}
-
-	void EventManager::pollTriggers(){
-		for (std::list<Trigger*>::iterator it = m_triggers.begin(); it!=m_triggers.end(); ++it) {
-			(*it)->pollTrigger();
-		}
-	}
-
 	void EventManager::setKeyFilter(IKeyFilter* keyFilter) {
 		m_keyfilter = keyFilter;
 	}