Mercurial > fife-parpg

diff engine/core/eventchannel/eventmanager.h @ 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
line wrap: on
line diff
--- a/engine/core/eventchannel/eventmanager.h	Fri Oct 01 16:26:22 2010 +0000
+++ b/engine/core/eventchannel/eventmanager.h	Fri Oct 01 19:25:40 2010 +0000
@@ -52,8 +52,6 @@
 #include "eventchannel/sdl/ec_isdleventcontroller.h"
 #include "eventchannel/sdl/ec_isdleventlistener.h"
 
-#include "eventchannel/trigger/ec_itriggercontroller.h"
-
 namespace FIFE {
 
 	class ICommandListener;
@@ -69,8 +67,7 @@
 		public IKeyController,
 		public IMouseController,
 		public ISdlEventController,
-		public IEventSource,
-		public ITriggerController {
+		public IEventSource {
 	public:
 		/** Constructor.
 		 */
@@ -83,21 +80,23 @@
 		void addCommandListener(ICommandListener* listener);
 		void addCommandListenerFront(ICommandListener* listener);
 		void removeCommandListener(ICommandListener* listener);
+
 		void dispatchCommand(Command& command);
+
 		void addKeyListener(IKeyListener* listener);
 		void addKeyListenerFront(IKeyListener* listener);
 		void removeKeyListener(IKeyListener* listener);
+
 		void addMouseListener(IMouseListener* listener);
 		void addMouseListenerFront(IMouseListener* listener);
 		void removeMouseListener(IMouseListener* listener);
+
 		void addSdlEventListener(ISdlEventListener* listener);
 		void addSdlEventListenerFront(ISdlEventListener* listener);
 		void removeSdlEventListener(ISdlEventListener* listener);
+
 		EventSourceType getEventSourceType();
 
-		void registerTrigger(Trigger& trigger);
-		void unregisterTrigger(Trigger& trigger);
-
 		/** Process the SDL event queue.
 		 * This is to be called only by the engine itself once per frame.
 		 * It passes appropriate events to their listeners
@@ -123,8 +122,6 @@
 		void fillKeyEvent(const SDL_Event& sdlevt, KeyEvent& keyevt);
 		void fillMouseEvent(const SDL_Event& sdlevt, MouseEvent& mouseevt);
 
-		void pollTriggers();
-
 		std::deque<ICommandListener*> m_commandlisteners;
 		std::deque<ICommandListener*> m_pending_commandlisteners;
 		std::deque<ICommandListener*> m_pending_commandlisteners_front;
@@ -150,7 +147,6 @@
 		int m_mousestate;
 		MouseEvent::MouseButtonType m_mostrecentbtn;
 
-		std::list<Trigger*> m_triggers;
 	};
 } //FIFE