BGE patch: Add NAND, NOR, XOR, XNOR controllers.

NAND controller is an inverted AND controller: the output is 
     1 if any of the input is 0.
NOR  controller is an inverted OR controller: the output is 0
     if any of the input is 1.
XOR  controller is an exclusive OR: the output is 1 if and only
     if one input is 1 and all the other inputs are 0.
XNOR controller is an inverted XOR: the output is 0 if and only
     if one input is 0 and all the other inputs are 0.
The NAND, NORT and XNOR controllers are very usefull to create
complementary outputs to start and stop actuators synchronously.
MSCV project files updated.

12 files changed, 854 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index cc9215e7d14..376f95b0145 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -66,6 +66,10 @@ typedef struct bController {
 #define CONT_LOGIC_OR	1
 #define CONT_EXPRESSION	2
 #define CONT_PYTHON		3
+#define CONT_LOGIC_NAND	4
+#define CONT_LOGIC_NOR	5
+#define CONT_LOGIC_XOR	6
+#define CONT_LOGIC_XNOR	7
 
 /* controller->flag */
 #define CONT_SHOW		1
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index e7933c10162..bfa451428c3 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -740,6 +740,14 @@ static char *controller_name(int type)
 		return "AND";
 	case CONT_LOGIC_OR:
 		return "OR";
+	case CONT_LOGIC_NAND:
+		return "NAND";
+	case CONT_LOGIC_NOR:
+		return "NOR";
+	case CONT_LOGIC_XOR:
+		return "XOR";
+	case CONT_LOGIC_XNOR:
+		return "XNOR";
 	case CONT_EXPRESSION:
 		return "Expression";
 	case CONT_PYTHON:
@@ -750,7 +758,7 @@ static char *controller_name(int type)
 
 static char *controller_pup(void)
 {
-	return "Controllers   %t|AND %x0|OR %x1|Expression %x2|Python %x3";
+	return "Controllers   %t|AND %x0|OR %x1|XOR %x6|NAND %x4|NOR %x5|XNOR %x7|Expression %x2|Python %x3";
 }
 
 static char *actuator_name(int type)
@@ -1066,6 +1074,10 @@ static void draw_default_sensor_header(bSensor *sens,
 			 (short)(x + 10 + 0.85 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
 			 &sens->invert, 0.0, 0.0, 0, 0,
 			 "Invert the level (output) of this sensor");
+	uiDefButS(block, TOG, 1, "Lvl",
+			 (short)(x + 10 + 0.70 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
+			 &sens->level, 0.0, 0.0, 0, 0,
+			 "Level detector versus edge detector (only applicable in case of logic state transition)");
 }
 
 static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short yco, short width,char* objectname)
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp
index 179dd9f8478..da490b4ee85 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.cpp
+++ b/source/gameengine/Converter/KX_ConvertControllers.cpp
@@ -35,6 +35,10 @@
 // Controller
 #include "SCA_ANDController.h"
 #include "SCA_ORController.h"
+#include "SCA_NANDController.h"
+#include "SCA_NORController.h"
+#include "SCA_XORController.h"
+#include "SCA_XNORController.h"
 #include "SCA_PythonController.h"
 #include "SCA_ExpressionController.h"
 
@@ -112,6 +116,30 @@ void BL_ConvertControllers(
 				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
 				break;
 			}
+			case CONT_LOGIC_NAND:
+			{
+				gamecontroller = new SCA_NANDController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_NOR:
+			{
+				gamecontroller = new SCA_NORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XOR:
+			{
+				gamecontroller = new SCA_XORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XNOR:
+			{
+				gamecontroller = new SCA_XNORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
 			case CONT_EXPRESSION:
 			{
 				bExpressionCont* bexpcont = (bExpressionCont*) bcontr->data;
diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp
new file mode 100644
index 00000000000..5b869ee8298
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NANDController.cpp
@@ -0,0 +1,144 @@
+/**
+ * 'Nand' together all inputs
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "SCA_NANDController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_NANDController::SCA_NANDController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_NANDController::~SCA_NANDController()
+{
+}
+
+
+
+void SCA_NANDController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = false;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (!sensor->IsPositiveTrigger())
+		{
+			sensorresult = true;
+			break;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_NANDController::GetReplica()
+{
+	CValue* replica = new SCA_NANDController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_NANDController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_NANDController",
+	sizeof(SCA_NANDController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_NANDController::Parents[] = {
+	&SCA_NANDController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_NANDController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_NANDController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h
new file mode 100644
index 00000000000..1193ff64f07
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NANDController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_NANDController.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __KX_NANDCONTROLLER
+#define __KX_NANDCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_NANDController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_NANDController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_NANDController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_NANDCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp
new file mode 100644
index 00000000000..2866dec0b74
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NORController.cpp
@@ -0,0 +1,144 @@
+/**
+ * 'Nor' together all inputs
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "SCA_NORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_NORController::SCA_NORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_NORController::~SCA_NORController()
+{
+}
+
+
+
+void SCA_NORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = true;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			sensorresult = false;
+			break;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_NORController::GetReplica()
+{
+	CValue* replica = new SCA_NORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_NORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_NORController",
+	sizeof(SCA_NORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_NORController::Parents[] = {
+	&SCA_NORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_NORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_NORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h
new file mode 100644
index 00000000000..aab59e3d46c
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_NORController.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __KX_NORCONTROLLER
+#define __KX_NORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_NORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_NORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_NORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_NORCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp
new file mode 100644
index 00000000000..3ef7c07fe0a
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XNORController.cpp
@@ -0,0 +1,148 @@
+/**
+ * 'Xnor' together all inputs
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "SCA_XNORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_XNORController::SCA_XNORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_XNORController::~SCA_XNORController()
+{
+}
+
+
+
+void SCA_XNORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = true;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			if (sensorresult == false)
+			{
+				sensorresult = true;
+				break;
+			}
+			sensorresult = false;
+		}
+	}
+
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_XNORController::GetReplica()
+{
+	CValue* replica = new SCA_XNORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_XNORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_XNORController",
+	sizeof(SCA_XNORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_XNORController::Parents[] = {
+	&SCA_XNORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_XNORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_XNORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h
new file mode 100644
index 00000000000..4b1eaee95d8
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XNORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_XNORController.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __KX_XNORCONTROLLER
+#define __KX_XNORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_XNORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_XNORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_XNORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_XNORCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp
new file mode 100644
index 00000000000..6499c62f5f2
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XORController.cpp
@@ -0,0 +1,148 @@
+/**
+ * 'Xor' together all inputs
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "SCA_XORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_XORController::SCA_XORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_XORController::~SCA_XORController()
+{
+}
+
+
+
+void SCA_XORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = false;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			if (sensorresult == true)
+			{
+                sensorresult = false;
+				break;
+			}
+            sensorresult = true;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_XORController::GetReplica()
+{
+	CValue* replica = new SCA_XORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_XORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_XORController",
+	sizeof(SCA_XORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_XORController::Parents[] = {
+	&SCA_XORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_XORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_XORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h
new file mode 100644
index 00000000000..f50cd33c125
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_XORController.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __KX_XORCONTROLLER
+#define __KX_XORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_XORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_XORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_XORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_XORCONTROLLER
+
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 56c2780871b..5311f059f03 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -101,7 +101,7 @@ void KX_TouchSensor::Init()
 {
 	m_bCollision = false;
 	m_bTriggered = false;
-	m_bLastTriggered = false;
+	m_bLastTriggered = (m_invert)?true:false;
 	m_hitObject =  NULL;
 }