1 files changed, 58 insertions, 5 deletions

diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index 51bd6454d92..3055e1d946f 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -29,17 +29,33 @@
 #ifndef __KX_IACTUATOR
 #define __KX_IACTUATOR
 
-#include "SCA_ILogicBrick.h"
+#include "SCA_IController.h"
 #include <vector>
 
+/*
+ * Use of SG_DList : element of actuator being deactivated
+ *                   Head: SCA_LogicManager::m_removedActuators
+ * Use of SG_QList : element of activated actuator list of their owner
+ *                   Head: SCA_IObject::m_activeActuators
+ */
 class SCA_IActuator : public SCA_ILogicBrick
 {
 	friend class SCA_LogicManager;
 protected:
 	int					 m_links;	// number of active links to controllers
 									// when 0, the actuator is automatically stopped
-	std::vector<CValue*> m_events;
-	void RemoveAllEvents();
+	//std::vector<CValue*> m_events;
+	bool			     m_posevent;
+	bool			     m_negevent;
+
+	std::vector<class SCA_IController*>		m_linkedcontrollers;
+
+	void RemoveAllEvents()
+	{
+		m_posevent = false;
+		m_negevent = false;
+	}
+
 
 public:
 	/**
@@ -75,7 +91,15 @@ public:
 	/** 
 	 * Add an event to an actuator.
 	 */ 
-	void AddEvent(CValue* event);
+	//void AddEvent(CValue* event)
+	void AddEvent(bool event)
+	{
+		if (event)
+			m_posevent = true;
+		else
+			m_negevent = true;
+	}
+
 	virtual void ProcessReplica();
 
 	/** 
@@ -84,9 +108,38 @@ public:
 	 * not immediately clear. But usually refers to key-up events
 	 * or events where no action is required.
 	 */
-	bool IsNegativeEvent() const;
+	bool IsNegativeEvent() const
+	{
+		return !m_posevent && m_negevent;
+	}
+
 	virtual ~SCA_IActuator();
 
+	/**
+	 * remove this actuator from the list of active actuators
+	 */
+	void Deactivate()
+	{
+		if (QDelink())
+			// the actuator was in the active list
+			if (m_gameobj->m_activeActuators.QEmpty())
+				// the owner object has no more active actuators, remove it from the global list
+				m_gameobj->m_activeActuators.Delink();
+	}
+
+	void Activate(SG_DList& head)
+	{
+		if (QEmpty())
+		{
+			InsertActiveQList(m_gameobj->m_activeActuators);
+			head.AddBack(&m_gameobj->m_activeActuators);
+		}
+	}
+
+	void	LinkToController(SCA_IController* controller);
+	void	UnlinkController(class SCA_IController* cont);
+	void	UnlinkAllControllers();
+
 	void ClrLink() { m_links=0; }
 	void IncLink() { m_links++; }
 	void DecLink();